Separate PolicyApplicator from ManagedNetworkConfigurationHandler.

This makes the dependency between the two classes explicit and more manageable. Pure refactoring, no functional change.

BUG=279268
(for chromeos/chromeos.gyp)
TBR=stevenjb@chromium.org

Review URL: https://chromiumcodereview.appspot.com/23522004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221435 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 5 deletions

diff --git a/chromeos/network/managed_network_configuration_handler_impl.h b/chromeos/network/managed_network_configuration_handler_impl.h
index 5baa796..fbe5b67 100644
--- a/chromeos/network/managed_network_configuration_handler_impl.h
+++ b/chromeos/network/managed_network_configuration_handler_impl.h
@@ -15,6 +15,7 @@
 #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;
@@ -29,7 +30,8 @@ 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;
@@ -85,15 +87,14 @@ class CHROMEOS_EXPORT ManagedNetworkConfigurationHandlerImpl
   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();