Allow device policy code to be optionally included.

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/notifications/notification_ui_manager.h"
@@ skipping 70 matching lines @@
 void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) {
   profile_manager_.reset(profile_manager);
 }
 
 PrefService* TestingBrowserProcess::local_state() {
   return local_state_;
 }
 
 policy::BrowserPolicyConnector*
     TestingBrowserProcess::browser_policy_connector() {
-  if (!browser_policy_connector_.get()) {
-    const policy::ConfigurationPolicyProvider::PolicyDefinitionList*
-        policy_list = policy::ConfigurationPolicyPrefStore::
-        GetChromePolicyDefinitionList();
+  if (!browser_policy_connector_.get())
     browser_policy_connector_.reset(
-        new policy::BrowserPolicyConnector(
-            new policy::DummyConfigurationPolicyProvider(policy_list),
-            new policy::DummyConfigurationPolicyProvider(policy_list)));
-  }
+        policy::BrowserPolicyConnector::CreateForTests());
   return browser_policy_connector_.get();
 }
 
 IconManager* TestingBrowserProcess::icon_manager() {
   return NULL;
 }
 
 ThumbnailGenerator* TestingBrowserProcess::GetThumbnailGenerator() {
   return NULL;
 }
@@ skipping 161 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();
 }