Add ManagedUserService for profile-specific managed user data.

chrome/browser/managed_mode/managed_mode_browsertest.cc

Index: chrome/browser/managed_mode/managed_mode_browsertest.cc
diff --git a/chrome/browser/managed_mode/managed_mode_browsertest.cc b/chrome/browser/managed_mode/managed_mode_browsertest.cc
index f90d4a8f5a92789630ac64bb4b708e699efb4c29..57de49becf0b0565ddd3bb4b53bf5b8ebf5ef253 100644
--- a/chrome/browser/managed_mode/managed_mode_browsertest.cc
+++ b/chrome/browser/managed_mode/managed_mode_browsertest.cc
@@ -1,22 +1,17 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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/values.h"
 #include "chrome/browser/api/infobars/confirm_infobar_delegate.h"
-#include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_tab_helper.h"
 #include "chrome/browser/managed_mode/managed_mode.h"
-#include "chrome/browser/managed_mode/managed_mode_url_filter.h"
-#include "chrome/browser/prefs/pref_service.h"
-#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_notification_types.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 "content/public/browser/interstitial_page.h"
@@ -25,99 +20,12 @@
 #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/test_utils.h"
-#include "googleurl/src/gurl.h"
 
 using content::InterstitialPage;
-using content::MessageLoopRunner;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::WebContents;
 
-namespace {
-
-class ManagedModeURLFilterObserver : public ManagedModeURLFilter::Observer {
- public:
-  explicit ManagedModeURLFilterObserver(ManagedModeURLFilter* url_filter)
-      : url_filter_(url_filter) {
-    Reset();
-    url_filter_->AddObserver(this);
-  }
-
-  ~ManagedModeURLFilterObserver() {
-    url_filter_->RemoveObserver(this);
-  }
-
-  void Wait() {
-    message_loop_runner_->Run();
-    Reset();
-  }
-
-  // ManagedModeURLFilter::Observer
-  virtual void OnSiteListUpdated() OVERRIDE {
-    message_loop_runner_->Quit();
-  }
-
- private:
-  void Reset() {
-    message_loop_runner_ = new MessageLoopRunner;
-  }
-
-  ManagedModeURLFilter* url_filter_;
-  scoped_refptr<MessageLoopRunner> message_loop_runner_;
-};
-
-}  // namespace
-
-class ManagedModeContentPackTest : public ExtensionBrowserTest {
- public:
-  ManagedModeContentPackTest() {}
-  virtual ~ManagedModeContentPackTest() {}
-
-  virtual void SetUpOnMainThread() OVERRIDE {
-    PrefService* prefs = browser()->profile()->GetPrefs();
-    prefs->SetInteger(prefs::kDefaultManagedModeFilteringBehavior,
-                      ManagedModeURLFilter::WARN);
-  }
-};
-
-IN_PROC_BROWSER_TEST_F(ManagedModeContentPackTest, InstallContentPacks) {
-  ManagedMode* managed_mode = ManagedMode::GetInstance();
-  ManagedModeURLFilter* url_filter =
-      managed_mode->GetURLFilterForUIThreadImpl();
-  ManagedModeURLFilterObserver observer(url_filter);
-
-  GURL url("http://example.com");
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
-            url_filter->GetFilteringBehaviorForURL(url));
-
-  managed_mode->SetInManagedMode(browser()->profile());
-  observer.Wait();
-
-  EXPECT_EQ(ManagedModeURLFilter::WARN,
-            url_filter->GetFilteringBehaviorForURL(url));
-
-  const extensions::Extension* extension = LoadExtension(
-      test_data_dir_.AppendASCII("managed_mode/content_pack"));
-  ASSERT_TRUE(extension) << "Failed to load extension.";
-  observer.Wait();
-
-  ScopedVector<ManagedModeSiteList> site_lists =
-      GetActiveSiteLists(&managed_user_service);
-  ASSERT_EQ(1u, site_lists.size());
-  std::vector<ManagedModeSiteList::Site> sites;
-  site_lists[0]->GetSites(&sites);
-  ASSERT_EQ(3u, sites.size());
-  EXPECT_EQ(ASCIIToUTF16("YouTube"), sites[0].name);
-  EXPECT_EQ(ASCIIToUTF16("Homestar Runner"), sites[1].name);
-  EXPECT_EQ(string16(), sites[2].name);
-
-  EXPECT_EQ(ManagedModeURLFilter::ALLOW,
-            url_filter->GetFilteringBehaviorForURL(url));
-  EXPECT_EQ(ManagedModeURLFilter::WARN,
-            url_filter->GetFilteringBehaviorForURL(GURL("http://moose.org")));
-}
-
 // TODO(sergiu): Make the webkit error message disappear when navigating to an
 // interstitial page. The message states: "Not allowed to load local resource:
 // chrome://resources/css/widgets.css" followed by the compiled page.
@@ -141,7 +49,8 @@ class ManagedModeBlockModeTest : public InProcessBrowserTest {
     INFOBAR_NOT_USED,
   };
 
-  ManagedModeBlockModeTest() {}
+  ManagedModeBlockModeTest() : managed_user_service_(NULL) {}
+  virtual ~ManagedModeBlockModeTest() {}
 
   // Builds the redirect URL for the testserver from the hostnames and the
   // final URL and returns it as a string.
@@ -243,7 +152,12 @@ class ManagedModeBlockModeTest : public InProcessBrowserTest {
   }
 
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) {
+  virtual void SetUpOnMainThread() OVERRIDE {
+    managed_user_service_ =
+        ManagedUserServiceFactory::GetForProfile(browser()->profile());
+  }
+
+  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();
@@ -254,8 +168,7 @@ class ManagedModeBlockModeTest : public InProcessBrowserTest {
         "MAP *.a.com " + host_port);
   }
 
- private:
-  DISALLOW_COPY_AND_ASSIGN(ManagedModeBlockModeTest);
+  ManagedUserService* managed_user_service_;
 };
 
 // Navigates to a URL which is not in a manual list, clicks preview on the
@@ -270,7 +183,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, SimpleURLNotInAnyLists) {
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Same as above just that the URL redirects to a second URL first. The initial
@@ -288,9 +201,9 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, RedirectedURLsNotInAnyLists) {
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true,
-      "http://.www.a.com/server-redirect"));
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(
+      true, "http://.www.a.com/server-redirect"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Navigates to a URL in the whitelist. No interstitial should be shown and
@@ -299,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, SimpleURLInWhitelist) {
   GURL test_url("http://www.example.com/files/simple.html");
   ListValue whitelist;
   whitelist.AppendString(test_url.host());
-  ManagedMode::AddToManualList(true, whitelist);
+  managed_user_service_->AddToManualList(true, whitelist);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ -307,7 +220,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, SimpleURLInWhitelist) {
 
   CheckShownPageIsNotInterstitial(tab);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Navigates to a URL which redirects to another URL, both in the whitelist.
@@ -323,7 +236,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   ListValue whitelist;
   whitelist.AppendString("www.a.com");
   whitelist.AppendString("www.example.com");
-  ManagedMode::AddToManualList(true, whitelist);
+  managed_user_service_->AddToManualList(true, whitelist);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ -331,8 +244,8 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
 
   CheckShownPageIsNotInterstitial(tab);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.a.com"));
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.a.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Only one URL is in the whitelist and the second not, so it should redirect,
@@ -348,7 +261,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   // Add the first URL to the whitelist.
   ListValue whitelist;
   whitelist.AppendString("www.a.com");
-  ManagedMode::AddToManualList(true, whitelist);
+  managed_user_service_->AddToManualList(true, whitelist);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ -358,8 +271,8 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.a.com"));
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.a.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // This test navigates to a URL which is not in the whitelist but redirects to
@@ -376,7 +289,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   // Add the last URL to the whitelist.
   ListValue whitelist;
   whitelist.AppendString("www.example.com");
-  ManagedMode::AddToManualList(true, whitelist);
+  managed_user_service_->AddToManualList(true, whitelist);
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
@@ -387,9 +300,9 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED,
                                    INFOBAR_ALREADY_ADDED);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true,
-      "http://.www.a.com/server-redirect"));
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(
+      true, "http://.www.a.com/server-redirect"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Tests whether going back after being shown an interstitial works. No
@@ -407,7 +320,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
 
   EXPECT_EQ(tab->GetURL().spec(), "about:blank");
 
-  EXPECT_FALSE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_FALSE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // Like SimpleURLNotInAnyLists just that it navigates to a page on the allowed
@@ -423,7 +336,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 
   // Navigate to a different page on the same host.
   test_url = GURL("http://www.example.com/files/english_page.html");
@@ -446,7 +359,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 
   // Reload the page
   tab->GetController().Reload(false);
@@ -473,7 +386,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
   // Check that the https:// version is added in the whitelist.
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "https://www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "https://www.example.com"));
 }
 
 // The test navigates to a page, the interstitial is shown and preview is
@@ -538,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
 
   CheckNumberOfInfobars(0);
 
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true, "www.example.com"));
 }
 
 // The test navigates to a page, the interstitial is shown and preview is
@@ -583,6 +496,7 @@ IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
 
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_PROCEED, INFOBAR_ACCEPT);
 
-  EXPECT_FALSE(ManagedMode::IsInManualList(true, "www.example.com"));
-  EXPECT_TRUE(ManagedMode::IsInManualList(true, "www.new-example.com"));
+  EXPECT_FALSE(managed_user_service_->IsInManualList(true, "www.example.com"));
+  EXPECT_TRUE(managed_user_service_->IsInManualList(true,
+                                                    "www.new-example.com"));
 }