Refactored the URLBlacklistManager to avoid chrome/ and content/ dependencies.

chrome/browser/policy/url_blacklist_manager_unittest.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 "chrome/browser/policy/url_blacklist_manager.h"
 
 #include <ostream>
 
 #include "base/basictypes.h"
 #include "base/message_loop/message_loop.h"
+#include "base/message_loop/message_loop_proxy.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
-#include "chrome/common/pref_names.h"
-#include "content/public/test/test_browser_thread.h"
+#include "chrome/browser/policy/policy_helpers.h"
+#include "chrome/common/net/url_fixer_upper.h"
+#include "components/policy/core/common/policy_pref_names.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "net/base/request_priority.h"
 #include "net/url_request/url_request.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
 namespace policy {
 
 namespace {
 
-using content::BrowserThread;
+// Helper to get the disambiguated SegmentURL() function.
+URLBlacklist::SegmentURLCallback GetSegmentURLCallback() {
+  return URLFixerUpper::SegmentURL;
+}
 
 class TestingURLBlacklistManager : public URLBlacklistManager {
  public:
   explicit TestingURLBlacklistManager(PrefService* pref_service)
-      : URLBlacklistManager(pref_service),
+      : URLBlacklistManager(pref_service,
+                            base::MessageLoopProxy::current(),
+                            GetSegmentURLCallback(),
+                            SkipBlacklistForURL),
         update_called_(0),
-        set_blacklist_called_(false) {
-  }
+        set_blacklist_called_(false) {}
 
   virtual ~TestingURLBlacklistManager() {
   }
 
   // Make this method public for testing.
   using URLBlacklistManager::ScheduleUpdate;
 
   // Makes a direct call to UpdateOnIO during tests.
   void UpdateOnIOForTesting() {
     scoped_ptr<base::ListValue> block(new base::ListValue);
@@ skipping 18 matching lines @@
 
  private:
   int update_called_;
   bool set_blacklist_called_;
 
   DISALLOW_COPY_AND_ASSIGN(TestingURLBlacklistManager);
 };
 
 class URLBlacklistManagerTest : public testing::Test {
  protected:
-  URLBlacklistManagerTest()
-      : loop_(base::MessageLoop::TYPE_IO),
-        ui_thread_(BrowserThread::UI, &loop_),
-        file_thread_(BrowserThread::FILE, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {
-  }
+  URLBlacklistManagerTest() : loop_(base::MessageLoop::TYPE_IO) {}
 
   virtual void SetUp() OVERRIDE {
-    pref_service_.registry()->RegisterListPref(prefs::kUrlBlacklist);
-    pref_service_.registry()->RegisterListPref(prefs::kUrlWhitelist);
-    blacklist_manager_.reset(
-        new TestingURLBlacklistManager(&pref_service_));
+    pref_service_.registry()->RegisterListPref(policy_prefs::kUrlBlacklist);
+    pref_service_.registry()->RegisterListPref(policy_prefs::kUrlWhitelist);
+    blacklist_manager_.reset(new TestingURLBlacklistManager(&pref_service_));
     loop_.RunUntilIdle();
   }
 
   virtual void TearDown() OVERRIDE {
     if (blacklist_manager_.get())
       blacklist_manager_->ShutdownOnUIThread();
     loop_.RunUntilIdle();
     // Delete |blacklist_manager_| while |io_thread_| is mapping IO to
     // |loop_|.
     blacklist_manager_.reset();
   }
 
   base::MessageLoop loop_;
   TestingPrefServiceSimple pref_service_;
   scoped_ptr<TestingURLBlacklistManager> blacklist_manager_;
-
- private:
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
-  content::TestBrowserThread io_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(URLBlacklistManagerTest);
 };
 
 // Parameters for the FilterToComponents test.
 struct FilterTestParams {
  public:
   FilterTestParams(const std::string& filter, const std::string& scheme,
                    const std::string& host, bool match_subdomains, uint16 port,
                    const std::string& path)
       : filter_(filter), scheme_(scheme), host_(host),
         match_subdomains_(match_subdomains), port_(port), path_(path) {}
@@ skipping 47 matching lines @@
 
 }  // namespace
 
 TEST_P(URLBlacklistFilterToComponentsTest, FilterToComponents) {
   std::string scheme;
   std::string host;
   bool match_subdomains = true;
   uint16 port = 42;
   std::string path;
 
-  URLBlacklist::FilterToComponents(GetParam().filter(), &scheme, &host,
-                                   &match_subdomains, &port, &path);
+  URLBlacklist::FilterToComponents(GetSegmentURLCallback(), GetParam().filter(),
+                                   &scheme, &host, &match_subdomains, &port,
+                                   &path);
   EXPECT_EQ(GetParam().scheme(), scheme);
   EXPECT_EQ(GetParam().host(), host);
   EXPECT_EQ(GetParam().match_subdomains(), match_subdomains);
   EXPECT_EQ(GetParam().port(), port);
   EXPECT_EQ(GetParam().path(), path);
 }
 
 TEST_F(URLBlacklistManagerTest, SingleUpdateForTwoPrefChanges) {
   ListValue* blacklist = new ListValue;
   blacklist->Append(new StringValue("*.google.com"));
   ListValue* whitelist = new ListValue;
   whitelist->Append(new StringValue("mail.google.com"));
-  pref_service_.SetManagedPref(prefs::kUrlBlacklist, blacklist);
-  pref_service_.SetManagedPref(prefs::kUrlBlacklist, whitelist);
+  pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist, blacklist);
+  pref_service_.SetManagedPref(policy_prefs::kUrlBlacklist, whitelist);
   loop_.RunUntilIdle();
 
   EXPECT_EQ(1, blacklist_manager_->update_called());
 }
 
 TEST_F(URLBlacklistManagerTest, ShutdownWithPendingTask0) {
   // Post an update task to the UI thread.
   blacklist_manager_->ScheduleUpdate();
   // Shutdown comes before the task is executed.
   blacklist_manager_->ShutdownOnUIThread();
@@ skipping 103 matching lines @@
                          0u,
                          std::string()),
         FilterTestParams("http://*/whatever",
                          "http",
                          std::string(),
                          true,
                          0u,
                          "/whatever")));
 
 TEST_F(URLBlacklistManagerTest, Filtering) {
-  URLBlacklist blacklist;
+  URLBlacklist blacklist(GetSegmentURLCallback());
 
   // Block domain and all subdomains, for any filtered scheme.
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
   blocked->Append(new base::StringValue("google.com"));
   blacklist.Block(blocked.get());
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com/")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com/whatever")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://google.com/")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("bogus://google.com/")));
@@ skipping 132 matching lines @@
   blocked.reset(new base::ListValue);
   blocked->Append(new base::StringValue("example.com"));
   blacklist.Block(blocked.get());
   allowed.reset(new base::ListValue);
   allowed->Append(new base::StringValue("example.com"));
   blacklist.Allow(allowed.get());
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://example.com")));
 }
 
 TEST_F(URLBlacklistManagerTest, BlockAllWithExceptions) {
-  URLBlacklist blacklist;
+  URLBlacklist blacklist(GetSegmentURLCallback());
 
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
   scoped_ptr<base::ListValue> allowed(new base::ListValue);
   blocked->Append(new base::StringValue("*"));
   allowed->Append(new base::StringValue(".www.google.com"));
   allowed->Append(new base::StringValue("plus.google.com"));
   allowed->Append(new base::StringValue("https://mail.google.com"));
   allowed->Append(new base::StringValue("https://very.safe/path"));
   blacklist.Block(blocked.get());
   blacklist.Allow(allowed.get());
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://random.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://s.www.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://www.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://plus.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://s.plus.google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://mail.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://mail.google.com")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.mail.google.com")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://very.safe/")));
   EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://very.safe/path")));
   EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://very.safe/path")));
 }
 
 TEST_F(URLBlacklistManagerTest, DontBlockResources) {
-  scoped_ptr<URLBlacklist> blacklist(new URLBlacklist());
+  scoped_ptr<URLBlacklist> blacklist(new URLBlacklist(GetSegmentURLCallback()));
   scoped_ptr<base::ListValue> blocked(new base::ListValue);
   blocked->Append(new base::StringValue("google.com"));
   blacklist->Block(blocked.get());
   blacklist_manager_->SetBlacklist(blacklist.Pass());
   EXPECT_TRUE(blacklist_manager_->IsURLBlocked(GURL("http://google.com")));
 
   net::TestURLRequestContext context;
   net::URLRequest request(
       GURL("http://google.com"), net::DEFAULT_PRIORITY, NULL, &context);
 
@@ skipping 14 matching lines @@
 
   GURL sync_url(GaiaUrls::GetInstance()->service_login_url().Resolve(
       "?service=chromiumsync"));
   net::URLRequest sync_request(sync_url, net::DEFAULT_PRIORITY, NULL, &context);
   sync_request.SetLoadFlags(net::LOAD_MAIN_FRAME);
   EXPECT_EQ(block_signin_urls,
             blacklist_manager_->IsRequestBlocked(sync_request));
 }
 
 }  // namespace policy