| OLD | NEW |
| 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" |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 private: | 63 private: |
| 64 int update_called_; | 64 int update_called_; |
| 65 bool set_blacklist_called_; | 65 bool set_blacklist_called_; |
| 66 | 66 |
| 67 DISALLOW_COPY_AND_ASSIGN(TestingURLBlacklistManager); | 67 DISALLOW_COPY_AND_ASSIGN(TestingURLBlacklistManager); |
| 68 }; | 68 }; |
| 69 | 69 |
| 70 class URLBlacklistManagerTest : public testing::Test { | 70 class URLBlacklistManagerTest : public testing::Test { |
| 71 protected: | 71 protected: |
| 72 URLBlacklistManagerTest() | 72 URLBlacklistManagerTest() |
| 73 : loop_(MessageLoop::TYPE_IO), | 73 : loop_(base::MessageLoop::TYPE_IO), |
| 74 ui_thread_(BrowserThread::UI, &loop_), | 74 ui_thread_(BrowserThread::UI, &loop_), |
| 75 file_thread_(BrowserThread::FILE, &loop_), | 75 file_thread_(BrowserThread::FILE, &loop_), |
| 76 io_thread_(BrowserThread::IO, &loop_) { | 76 io_thread_(BrowserThread::IO, &loop_) {} |
| 77 } | |
| 78 | 77 |
| 79 virtual void SetUp() OVERRIDE { | 78 virtual void SetUp() OVERRIDE { |
| 80 pref_service_.registry()->RegisterListPref(prefs::kUrlBlacklist); | 79 pref_service_.registry()->RegisterListPref(prefs::kUrlBlacklist); |
| 81 pref_service_.registry()->RegisterListPref(prefs::kUrlWhitelist); | 80 pref_service_.registry()->RegisterListPref(prefs::kUrlWhitelist); |
| 82 blacklist_manager_.reset( | 81 blacklist_manager_.reset( |
| 83 new TestingURLBlacklistManager(&pref_service_)); | 82 new TestingURLBlacklistManager(&pref_service_)); |
| 84 loop_.RunUntilIdle(); | 83 loop_.RunUntilIdle(); |
| 85 } | 84 } |
| 86 | 85 |
| 87 virtual void TearDown() OVERRIDE { | 86 virtual void TearDown() OVERRIDE { |
| 88 if (blacklist_manager_.get()) | 87 if (blacklist_manager_.get()) |
| 89 blacklist_manager_->ShutdownOnUIThread(); | 88 blacklist_manager_->ShutdownOnUIThread(); |
| 90 loop_.RunUntilIdle(); | 89 loop_.RunUntilIdle(); |
| 91 // Delete |blacklist_manager_| while |io_thread_| is mapping IO to | 90 // Delete |blacklist_manager_| while |io_thread_| is mapping IO to |
| 92 // |loop_|. | 91 // |loop_|. |
| 93 blacklist_manager_.reset(); | 92 blacklist_manager_.reset(); |
| 94 } | 93 } |
| 95 | 94 |
| 96 MessageLoop loop_; | 95 base::MessageLoop loop_; |
| 97 TestingPrefServiceSimple pref_service_; | 96 TestingPrefServiceSimple pref_service_; |
| 98 scoped_ptr<TestingURLBlacklistManager> blacklist_manager_; | 97 scoped_ptr<TestingURLBlacklistManager> blacklist_manager_; |
| 99 | 98 |
| 100 private: | 99 private: |
| 101 content::TestBrowserThread ui_thread_; | 100 content::TestBrowserThread ui_thread_; |
| 102 content::TestBrowserThread file_thread_; | 101 content::TestBrowserThread file_thread_; |
| 103 content::TestBrowserThread io_thread_; | 102 content::TestBrowserThread io_thread_; |
| 104 | 103 |
| 105 DISALLOW_COPY_AND_ASSIGN(URLBlacklistManagerTest); | 104 DISALLOW_COPY_AND_ASSIGN(URLBlacklistManagerTest); |
| 106 }; | 105 }; |
| (...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 | 524 |
| 526 GURL sync_url( | 525 GURL sync_url( |
| 527 GaiaUrls::GetInstance()->service_login_url() + "?service=chromiumsync"); | 526 GaiaUrls::GetInstance()->service_login_url() + "?service=chromiumsync"); |
| 528 net::URLRequest sync_request(sync_url, NULL, &context); | 527 net::URLRequest sync_request(sync_url, NULL, &context); |
| 529 sync_request.set_load_flags(net::LOAD_MAIN_FRAME); | 528 sync_request.set_load_flags(net::LOAD_MAIN_FRAME); |
| 530 EXPECT_EQ(block_signin_urls, | 529 EXPECT_EQ(block_signin_urls, |
| 531 blacklist_manager_->IsRequestBlocked(sync_request)); | 530 blacklist_manager_->IsRequestBlocked(sync_request)); |
| 532 } | 531 } |
| 533 | 532 |
| 534 } // namespace policy | 533 } // namespace policy |
| OLD | NEW |