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

Unified Diff: chrome/browser/policy/url_blacklist_manager_unittest.cc

Issue 12502017: signin: pull basic SigninManager functionality into new SigninManagerBase class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: deal with new enterprise_platform_keys_private_api Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.cc ('k') | chrome/browser/signin/fake_signin_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/policy/url_blacklist_manager_unittest.cc
diff --git a/chrome/browser/policy/url_blacklist_manager_unittest.cc b/chrome/browser/policy/url_blacklist_manager_unittest.cc
index b1f69d11139d9b645e3b146c56d66bfbf8e1b2ea..7fed421c5a58113da7550205d857ea3f3400843a 100644
--- a/chrome/browser/policy/url_blacklist_manager_unittest.cc
+++ b/chrome/browser/policy/url_blacklist_manager_unittest.cc
@@ -515,12 +515,20 @@ TEST_F(URLBlacklistManagerTest, DontBlockResources) {
request.set_load_flags(net::LOAD_MAIN_FRAME);
EXPECT_TRUE(blacklist_manager_->IsRequestBlocked(request));
- // Sync gets a free pass.
+ // On most platforms, sync gets a free pass due to signin flows.
+ bool block_signin_urls = false;
+#if defined(OS_CHROMEOS)
+ // There are no sync specific signin flows on Chrome OS, so no special
+ // treatment.
+ block_signin_urls = true;
+#endif
+
GURL sync_url(
GaiaUrls::GetInstance()->service_login_url() + "?service=chromiumsync");
net::URLRequest sync_request(sync_url, NULL, &context);
sync_request.set_load_flags(net::LOAD_MAIN_FRAME);
- EXPECT_FALSE(blacklist_manager_->IsRequestBlocked(sync_request));
+ EXPECT_EQ(block_signin_urls,
+ blacklist_manager_->IsRequestBlocked(sync_request));
}
} // namespace policy
« no previous file with comments | « chrome/browser/policy/url_blacklist_manager.cc ('k') | chrome/browser/signin/fake_signin_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698