Separate PolicyApplicator from ManagedNetworkConfigurationHandler.

chromeos/network/managed_network_configuration_handler_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
 #define CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_
 
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/network/managed_network_configuration_handler.h"
 #include "chromeos/network/network_handler_callbacks.h"
 #include "chromeos/network/network_profile_observer.h"
+#include "chromeos/network/policy_applicator.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace chromeos {
 
 class NetworkConfigurationHandler;
 struct NetworkProfile;
 class NetworkProfileHandler;
 class NetworkStateHandler;
 
 class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
     : public ManagedNetworkConfigurationHandler,
-      public NetworkProfileObserver {
+      public NetworkProfileObserver,
+      public PolicyApplicator::ConfigurationHandler {
  public:
   typedef std::map<std::string, const base::DictionaryValue*> GuidToPolicyMap;
   typedef std::map<std::string, GuidToPolicyMap> UserToPoliciesMap;
 
   virtual ~ManagedNetworkConfigurationHandlerImpl();
 
   // ManagedNetworkConfigurationHandler overrides
   virtual void AddObserver(NetworkPolicyObserver* observer) OVERRIDE;
   virtual void RemoveObserver(NetworkPolicyObserver* observer) OVERRIDE;
 
@@ skipping 35 matching lines @@
       onc::ONCSource* onc_source) const OVERRIDE;
 
   virtual const base::DictionaryValue* FindPolicyByGuidAndProfile(
       const std::string& guid,
       const std::string& profile_path) const OVERRIDE;
 
   // NetworkProfileObserver overrides
   virtual void OnProfileAdded(const NetworkProfile& profile) OVERRIDE;
   virtual void OnProfileRemoved(const NetworkProfile& profile) OVERRIDE;
 
-  NetworkConfigurationHandler* network_configuration_handler() {
-    return network_configuration_handler_;
-  }
+  // PolicyApplicator::ConfigurationHandler overrides
+  virtual void CreateConfigurationFromPolicy(
+      const base::DictionaryValue& shill_properties) OVERRIDE;
 
  private:
   friend class ClientCertResolverTest;
   friend class NetworkHandler;
   friend class ManagedNetworkConfigurationHandlerTest;
-  class PolicyApplicator;
 
   ManagedNetworkConfigurationHandlerImpl();
 
   void Init(NetworkStateHandler* network_state_handler,
             NetworkProfileHandler* network_profile_handler,
             NetworkConfigurationHandler* network_configuration_handler);
 
   void GetManagedPropertiesCallback(
       const network_handler::DictionaryResultCallback& callback,
       const network_handler::ErrorCallback& error_callback,
@@ skipping 21 matching lines @@
   // For Shill client callbacks
   base::WeakPtrFactory<ManagedNetworkConfigurationHandlerImpl>
       weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ManagedNetworkConfigurationHandlerImpl);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_NETWORK_MANAGED_NETWORK_CONFIGURATION_HANDLER_IMPL_H_