Add ManagedUserService for profile-specific managed user data.

chrome/browser/managed_mode/managed_mode_browsertest.cc

-// 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"
 #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/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.
 class ManagedModeBlockModeTest : public InProcessBrowserTest {
  public:
   // Indicates whether the interstitial should proceed or not.
   enum InterstitialAction {
     INTERSTITIAL_PROCEED,
     INTERSTITIAL_DONTPROCEED,
   };
 
   // Indicates the infobar action or expected state. INFOBAR_ACCEPT and
   // INFOBAR_CANCEL act on the infobar. INFOBAR_ALREADY_ADDED shows that
   // the "Website was already added infobar" is expected (which expires
   // automatically) and INFOBAR_NOT_USED shows that an infobar is not expected
   // in this case.
   enum InfobarAction {
     INFOBAR_ACCEPT,
     INFOBAR_CANCEL,
     INFOBAR_ALREADY_ADDED,
     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.
   std::string GetRedirectURL(std::vector<std::string> hostnames,
                              std::string final_url) {
     // TODO(sergiu): Figure out how to make multiple successive redirects
     // trigger multiple notfications to test more advanced scenarios.
     std::string output;
     for (std::vector<std::string>::const_iterator it = hostnames.begin();
          it != hostnames.end(); ++it) {
@@ skipping 81 matching lines @@
       content::WindowedNotificationObserver observer(
           content::NOTIFICATION_INTERSTITIAL_DETACHED,
           content::Source<WebContents>(tab));
       interstitial_page->DontProceed();
       observer.Wait();
     }
     CheckNumberOfInfobars(0);
   }
 
  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();
     command_line->AppendSwitch(switches::kManaged);
     command_line->AppendSwitchASCII(switches::kHostResolverRules,
         "MAP *.example.com " + host_port + "," +
         "MAP *.new-example.com " + host_port + "," +
         "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
 // interstitial and then allows the website. The website should now be in the
 // manual whitelist.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, SimpleURLNotInAnyLists) {
   GURL test_url("http://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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
 // exact URL should be in the whitelist as well as the second hostname.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest, RedirectedURLsNotInAnyLists) {
   std::vector<std::string> url_list;
   url_list.push_back("www.a.com");
   std::string last_url("www.example.com/files/simple.html");
   GURL test_url(GetRedirectURL(url_list, last_url));
 
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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
 // the browser should navigate to the page.
 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);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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.
 // No interstitial should be shown and the browser should navigate to the page.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        RedirectedURLsBothInWhitelist) {
   std::vector<std::string> url_list;
   url_list.push_back("www.a.com");
   std::string last_url("www.example.com/files/simple.html");
   GURL test_url(GetRedirectURL(url_list, last_url));
 
   // Add both hostnames to the whitelist, should navigate without interstitial.
   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);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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,
 // show an interstitial, then after clicking preview and clicking accept both
 // websites should be in the whitelist.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        RedirectedURLFirstInWhitelist) {
   std::vector<std::string> url_list;
   url_list.push_back("www.a.com");
   std::string last_url("www.example.com/files/simple.html");
   GURL test_url(GetRedirectURL(url_list, last_url));
 
   // 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);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   EXPECT_EQ(tab->GetURL().spec(), "http://" + last_url);
   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
 // one that is. The expected behavior is that the user will get an interstitial
 // and after clicking preview the user will see an infobar stating that the URL
 // was already in the whitelist (and the first URL gets added as well).
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        RedirectedURLLastInWhitelist) {
   std::vector<std::string> url_list;
   url_list.push_back("www.a.com");
   std::string last_url("www.example.com/files/simple.html");
   GURL test_url(GetRedirectURL(url_list, last_url));
 
   // 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);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   EXPECT_EQ(tab->GetURL().host(), "www.a.com");
   CheckShownPageIsInterstitial(tab);
   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
 // websites should be added to the whitelist.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        SimpleURLNotInAnyListsGoBack) {
   GURL test_url("http://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   CheckShownPageIsInterstitial(tab);
   ActOnInterstitialAndInfobar(tab, INTERSTITIAL_DONTPROCEED,
                                    INFOBAR_NOT_USED);
 
   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
 // domain after clicking allow on the infobar. The navigation should complete
 // and no interstitial should be shown the second time.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        SimpleURLNotInAnyListsNavigateAgain) {
   GURL test_url("http://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   // An interstitial should not show up.
   CheckShownPageIsNotInterstitial(tab);
   CheckNumberOfInfobars(0);
 }
 
 // Same as above just that it reloads the page instead of navigating to another
 // page on the website. Same expected behavior.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        SimpleURLNotInAnyListsReloadPageAfterAdd) {
   GURL test_url("http://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   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);
 
   // Expect that the page shows up and not an interstitial.
   CheckShownPageIsNotInterstitial(tab);
   CheckNumberOfInfobars(0);
   EXPECT_EQ(tab->GetURL().spec(), test_url.spec());
 }
 
 // Navigates to an HTTPS page not in any lists, similar to the simple test but
 // over HTTPS (expected behavior is that only the HTTPS version of the site
 // gets whitelisted, compared to the simple case where all protocols get
 // whitelisted).
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        SimpleHTTPSURLNotInAnyLists) {
   // Navigate to an HTTPS URL.
   GURL test_url("https://www.example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
 
   CheckShownPageIsInterstitial(tab);
   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
 // clicked but then the test navigates to other pages on the same domain before
 // clicking allow on the page. The "allow" infobar should still be there during
 // this time and the navigation should be allowed. When the test finally clicks
 // accept the webpage should be whitelisted.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        SimpleURLNotInAnyListNavigateAround) {
   GURL test_url("http://www.example.com/files/simple.html");
@@ skipping 44 matching lines @@
   content::WindowedNotificationObserver infobar_removed(
       chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
       content::NotificationService::AllSources());
 
   // Finally accept the infobar and see that it is gone.
   confirm_info_bar_delegate->Accept();
   infobar_removed.Wait();
 
   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
 // clicked but then the test navigates to a page on a different host, which
 // should trigger an interstitial again. Clicking preview on this interstitial
 // and accepting it should add the second website to the whitelist and not the
 // first one.
 IN_PROC_BROWSER_TEST_F(ManagedModeBlockModeTest,
                        NavigateDifferentHostAfterPreview) {
   GURL test_url("http://www.example.com/files/simple.html");
@@ skipping 24 matching lines @@
 
   // Navigate to another URL on a different host.
   test_url = GURL("http://www.new-example.com/files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   CheckShownPageIsInterstitial(tab);
   CheckNumberOfInfobars(0);
 
   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"));
 }