Move ManagedModePolicyProvider functionality to ManagedUserSettingsService.

chrome/browser/managed_mode/managed_mode_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/common/cancelable_request.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/managed_mode/managed_mode_interstitial.h"
 #include "chrome/browser/managed_mode/managed_mode_navigation_observer.h"
+#include "chrome/browser/managed_mode/managed_user_constants.h"
 #include "chrome/browser/managed_mode/managed_user_service.h"
 #include "chrome/browser/managed_mode/managed_user_service_factory.h"
-#include "chrome/browser/policy/managed_mode_policy_provider.h"
-#include "chrome/browser/policy/profile_policy_connector.h"
-#include "chrome/browser/policy/profile_policy_connector_factory.h"
+#include "chrome/browser/managed_mode/managed_user_settings_service.h"
+#include "chrome/browser/managed_mode/managed_user_settings_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "components/user_prefs/pref_registry_syncable.h"
 #include "content/public/browser/interstitial_page.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/browser_test_utils.h"
 #include "grit/generated_resources.h"
-#include "policy/policy_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using content::InterstitialPage;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
 namespace {
 
 // Tests the filter mode in which all sites are blocked by default.
@@ skipping 52 matching lines @@
   virtual void SetUpOnMainThread() OVERRIDE {
     // Set up the ManagedModeNavigationObserver manually since the profile was
     // not managed when the browser was created.
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ManagedModeNavigationObserver::CreateForWebContents(web_contents);
 
     Profile* profile = browser()->profile();
     managed_user_service_ = ManagedUserServiceFactory::GetForProfile(profile);
     managed_user_service_->InitForTesting();
-    policy::ProfilePolicyConnector* connector =
-        policy::ProfilePolicyConnectorFactory::GetForProfile(profile);
-    policy::ManagedModePolicyProvider* policy_provider =
-        connector->managed_mode_policy_provider();
-    policy_provider->SetLocalPolicyForTesting(
-        policy::key::kContentPackDefaultFilteringBehavior,
+    ManagedUserSettingsService* managed_user_settings_service =
+        ManagedUserSettingsServiceFactory::GetForProfile(profile);
+    managed_user_settings_service->SetLocalSettingForTesting(
+        managed_users::kContentPackDefaultFilteringBehavior,
         scoped_ptr<base::Value>(
             new base::FundamentalValue(ManagedModeURLFilter::BLOCK)));
-    base::RunLoop().RunUntilIdle();
   }
 
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     // Enable the test server and remap all URLs to it.
     ASSERT_TRUE(test_server()->Start());
     std::string host_port = test_server()->host_port_pair().ToString();
     command_line->AppendSwitchASCII(switches::kHostResolverRules,
         "MAP *.example.com " + host_port + "," +
         "MAP *.new-example.com " + host_port + "," +
         "MAP *.a.com " + host_port);
@@ skipping 49 matching lines @@
 }
 
 // Tests whether a visit attempt adds a special history entry.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        HistoryVisitRecorded) {
   GURL allowed_url("http://www.example.com/files/simple.html");
 
   // Set the host as allowed.
   scoped_ptr<DictionaryValue> dict(new DictionaryValue);
   dict->SetBooleanWithoutPathExpansion(allowed_url.host(), true);
-  policy::ProfilePolicyConnector* connector =
-      policy::ProfilePolicyConnectorFactory::GetForProfile(
+  ManagedUserSettingsService* managed_user_settings_service =
+      ManagedUserSettingsServiceFactory::GetForProfile(
           browser()->profile());
-  policy::ManagedModePolicyProvider* policy_provider =
-      connector->managed_mode_policy_provider();
-  policy_provider->SetLocalPolicyForTesting(
-      policy::key::kContentPackManualBehaviorHosts, dict.PassAs<Value>());
-  base::RunLoop().RunUntilIdle();
+  managed_user_settings_service->SetLocalSettingForTesting(
+      managed_users::kContentPackManualBehaviorHosts, dict.PassAs<Value>());
   EXPECT_EQ(
       ManagedUserService::MANUAL_ALLOW,
       managed_user_service_->GetManualBehaviorForHost(allowed_url.host()));
 
   ui_test_utils::NavigateToURL(browser(), allowed_url);
 
   // Navigate to it and check that we don't get an interstitial.
   WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
   CheckShownPageIsNotInterstitial(tab);
 
@@ skipping 39 matching lines @@
 
   CheckShownPageIsInterstitial(web_contents);
 
   content::WindowedNotificationObserver observer(
       content::NOTIFICATION_LOAD_STOP,
       content::NotificationService::AllSources());
 
   // Set the host as allowed.
   scoped_ptr<DictionaryValue> dict(new DictionaryValue);
   dict->SetBooleanWithoutPathExpansion(test_url.host(), true);
-  policy::ProfilePolicyConnector* connector =
-      policy::ProfilePolicyConnectorFactory::GetForProfile(
+  ManagedUserSettingsService* managed_user_settings_service =
+      ManagedUserSettingsServiceFactory::GetForProfile(
           browser()->profile());
-  policy::ManagedModePolicyProvider* policy_provider =
-      connector->managed_mode_policy_provider();
-  policy_provider->SetLocalPolicyForTesting(
-      policy::key::kContentPackManualBehaviorHosts, dict.PassAs<Value>());
-  base::RunLoop().RunUntilIdle();
+  managed_user_settings_service->SetLocalSettingForTesting(
+      managed_users::kContentPackManualBehaviorHosts, dict.PassAs<Value>());
   EXPECT_EQ(
       ManagedUserService::MANUAL_ALLOW,
       managed_user_service_->GetManualBehaviorForHost(test_url.host()));
 
   observer.Wait();
   EXPECT_EQ(test_url, web_contents->GetURL());
 }
 
 }  // namespace