Device policy infrastructure

chrome/test/testing_browser_process.h

Index: chrome/test/testing_browser_process.h
diff --git a/chrome/test/testing_browser_process.h b/chrome/test/testing_browser_process.h
index 6b8aca3692e6e8697f13061f567a750ec3e20d14..47adfa0e89610451e56f24de352fd353911c3ade 100644
--- a/chrome/test/testing_browser_process.h
+++ b/chrome/test/testing_browser_process.h
@@ -28,7 +28,7 @@ class WaitableEvent;
 }
 
 namespace policy {
-class ConfigurationPolicyProviderKeeper;
+class BrowserPolicyConnector;
 }
 
 namespace ui {
@@ -62,8 +62,7 @@ class TestingBrowserProcess : public BrowserProcess {
 
   virtual PrefService* local_state();
 
-  virtual policy::ConfigurationPolicyProviderKeeper*
-      configuration_policy_provider_keeper();
+  virtual policy::BrowserPolicyConnector* browser_policy_connector();
 
   virtual IconManager* icon_manager();
 
@@ -137,9 +136,7 @@ class TestingBrowserProcess : public BrowserProcess {
   std::string app_locale_;
 
   PrefService* pref_service_;
-  bool created_configuration_policy_provider_keeper_;
-  scoped_ptr<policy::ConfigurationPolicyProviderKeeper>
-      configuration_policy_provider_keeper_;
+  scoped_ptr<policy::BrowserPolicyConnector> browser_policy_connector_;
   scoped_ptr<GoogleURLTracker> google_url_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingBrowserProcess);