Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(241)

Side by Side Diff: chrome/browser/policy/url_blacklist_manager_unittest.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix double registration in Chrome Frame test. Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/policy/url_blacklist_manager.h" 5 #include "chrome/browser/policy/url_blacklist_manager.h"
6 6
7 #include <ostream> 7 #include <ostream>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
11 #include "chrome/browser/prefs/pref_registry_simple.h"
11 #include "chrome/common/pref_names.h" 12 #include "chrome/common/pref_names.h"
12 #include "chrome/test/base/testing_pref_service.h" 13 #include "chrome/test/base/testing_pref_service.h"
13 #include "content/public/test/test_browser_thread.h" 14 #include "content/public/test/test_browser_thread.h"
14 #include "googleurl/src/gurl.h" 15 #include "googleurl/src/gurl.h"
15 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
16 17
17 namespace policy { 18 namespace policy {
18 19
19 namespace { 20 namespace {
20 21
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 66
66 class URLBlacklistManagerTest : public testing::Test { 67 class URLBlacklistManagerTest : public testing::Test {
67 protected: 68 protected:
68 URLBlacklistManagerTest() 69 URLBlacklistManagerTest()
69 : ui_thread_(BrowserThread::UI, &loop_), 70 : ui_thread_(BrowserThread::UI, &loop_),
70 file_thread_(BrowserThread::FILE, &loop_), 71 file_thread_(BrowserThread::FILE, &loop_),
71 io_thread_(BrowserThread::IO, &loop_) { 72 io_thread_(BrowserThread::IO, &loop_) {
72 } 73 }
73 74
74 virtual void SetUp() OVERRIDE { 75 virtual void SetUp() OVERRIDE {
75 pref_service_.RegisterListPref(prefs::kUrlBlacklist); 76 pref_service_.registry()->RegisterListPref(prefs::kUrlBlacklist);
76 pref_service_.RegisterListPref(prefs::kUrlWhitelist); 77 pref_service_.registry()->RegisterListPref(prefs::kUrlWhitelist);
77 blacklist_manager_.reset( 78 blacklist_manager_.reset(
78 new TestingURLBlacklistManager(&pref_service_)); 79 new TestingURLBlacklistManager(&pref_service_));
79 loop_.RunUntilIdle(); 80 loop_.RunUntilIdle();
80 } 81 }
81 82
82 virtual void TearDown() OVERRIDE { 83 virtual void TearDown() OVERRIDE {
83 if (blacklist_manager_.get()) 84 if (blacklist_manager_.get())
84 blacklist_manager_->ShutdownOnUIThread(); 85 blacklist_manager_->ShutdownOnUIThread();
85 loop_.RunUntilIdle(); 86 loop_.RunUntilIdle();
86 // Delete |blacklist_manager_| while |io_thread_| is mapping IO to 87 // Delete |blacklist_manager_| while |io_thread_| is mapping IO to
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://s.plus.google.com"))); 435 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("http://s.plus.google.com")));
435 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://mail.google.com"))); 436 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://mail.google.com")));
436 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://mail.google.com"))); 437 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://mail.google.com")));
437 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.mail.google.com"))); 438 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://s.mail.google.com")));
438 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://very.safe/"))); 439 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("https://very.safe/")));
439 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://very.safe/path"))); 440 EXPECT_TRUE(blacklist.IsURLBlocked(GURL("http://very.safe/path")));
440 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://very.safe/path"))); 441 EXPECT_FALSE(blacklist.IsURLBlocked(GURL("https://very.safe/path")));
441 } 442 }
442 443
443 } // namespace policy 444 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698