Device policy infrastructure

chrome/test/testing_browser_process.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/test/testing_browser_process.h"
 
 #include "base/string_util.h"
 #include "base/synchronization/waitable_event.h"
 #include "chrome/browser/google/google_url_tracker.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/policy/browser_policy_connector.h"
 #include "chrome/browser/policy/configuration_policy_pref_store.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/configuration_policy_provider_keeper.h"
 #include "chrome/browser/policy/dummy_configuration_policy_provider.h"
 #include "ui/base/clipboard/clipboard.h"
 
 TestingBrowserProcess::TestingBrowserProcess()
     : shutdown_event_(new base::WaitableEvent(true, false)),
       module_ref_count_(0),
       app_locale_("en"),
-      pref_service_(NULL),
-      created_configuration_policy_provider_keeper_(false) {
+      pref_service_(NULL) {
 }
 
 TestingBrowserProcess::~TestingBrowserProcess() {
 }
 
 void TestingBrowserProcess::EndSession() {
 }
 
 ResourceDispatcherHost* TestingBrowserProcess::resource_dispatcher_host() {
   return NULL;
@@ skipping 26 matching lines @@
 }
 
 ProfileManager* TestingBrowserProcess::profile_manager() {
   return NULL;
 }
 
 PrefService* TestingBrowserProcess::local_state() {
   return pref_service_;
 }
 
-policy::ConfigurationPolicyProviderKeeper*
-TestingBrowserProcess::configuration_policy_provider_keeper() {
-  if (!created_configuration_policy_provider_keeper_) {
-    DCHECK(configuration_policy_provider_keeper_.get() == NULL);
-    created_configuration_policy_provider_keeper_ = true;
+policy::BrowserPolicyConnector*
+    TestingBrowserProcess::browser_policy_connector() {
+  if (!browser_policy_connector_.get()) {
     const policy::ConfigurationPolicyProvider::PolicyDefinitionList*
         policy_list = policy::ConfigurationPolicyPrefStore::
         GetChromePolicyDefinitionList();
-    configuration_policy_provider_keeper_.reset(
-        new policy::ConfigurationPolicyProviderKeeper(
-            new policy::DummyConfigurationPolicyProvider(policy_list),
+    browser_policy_connector_.reset(
+        new policy::BrowserPolicyConnector(
             new policy::DummyConfigurationPolicyProvider(policy_list),
             new policy::DummyConfigurationPolicyProvider(policy_list)));
   }
-  return configuration_policy_provider_keeper_.get();
+  return browser_policy_connector_.get();
 }
 
 IconManager* TestingBrowserProcess::icon_manager() {
   return NULL;
 }
 
 ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() {
   return NULL;
 }
 
@@ skipping 118 matching lines @@
 
 ScopedTestingBrowserProcess::~ScopedTestingBrowserProcess() {
   DCHECK_EQ(browser_process_.get(), g_browser_process);
 
   // TODO(phajdan.jr): Temporary, for http://crbug.com/61062.
   // After the transition is over, we should just
   // reset |g_browser_process| to NULL.
   browser_process_.reset();
   g_browser_process = new TestingBrowserProcess();
 }