Device policy infrastructure

chrome/browser/profiles/profile_impl.cc

Index: chrome/browser/profiles/profile_impl.cc
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
index aa8fabfa9bbb3fb486133c00d45770887c00fb97..fd2b89b7beb4472168b9891d152ed711bb6dd89a 100644
--- a/chrome/browser/profiles/profile_impl.cc
+++ b/chrome/browser/profiles/profile_impl.cc
@@ -57,7 +57,7 @@
 #include "chrome/browser/password_manager/password_store_default.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/profile_policy_context.h"
+#include "chrome/browser/policy/profile_policy_connector.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_value_store.h"
 #include "chrome/browser/prerender/prerender_manager.h"
@@ -335,7 +335,7 @@ ProfileImpl::ProfileImpl(const FilePath& path)
   extension_io_event_router_ = new ExtensionIOEventRouter(this);
   extension_info_map_ = new ExtensionInfoMap();
 
-  GetPolicyContext()->Initialize();
+  GetPolicyConnector()->Initialize();
 
   clear_local_state_on_exit_ = prefs->GetBoolean(prefs::kClearSiteDataOnExit);
 
@@ -508,7 +508,7 @@ ProfileImpl::~ProfileImpl() {
       Source<Profile>(this),
       NotificationService::NoDetails());
 
-  GetPolicyContext()->Shutdown();
+  GetPolicyConnector()->Shutdown();
 
   tab_restore_service_ = NULL;
 
@@ -1365,11 +1365,11 @@ ExtensionInfoMap* ProfileImpl::GetExtensionInfoMap() {
   return extension_info_map_.get();
 }
 
-policy::ProfilePolicyContext* ProfileImpl::GetPolicyContext() {
-  if (!profile_policy_context_.get())
-    profile_policy_context_.reset(new policy::ProfilePolicyContext(this));
+policy::ProfilePolicyConnector* ProfileImpl::GetPolicyConnector() {
+  if (!profile_policy_connector_.get())
+    profile_policy_connector_.reset(new policy::ProfilePolicyConnector(this));
 
-  return profile_policy_context_.get();
+  return profile_policy_connector_.get();
 }
 
 PromoCounter* ProfileImpl::GetInstantPromoCounter() {