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

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

Issue 10911198: SPDY - disable SPDY based on command line and policy (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
Index: chrome/browser/policy/policy_browsertest.cc
===================================================================
--- chrome/browser/policy/policy_browsertest.cc (revision 156023)
+++ chrome/browser/policy/policy_browsertest.cc (working copy)
@@ -641,13 +641,14 @@
provider_.UpdateChromePolicy(policies);
content::RunAllPendingInMessageLoop();
EXPECT_FALSE(net::HttpStreamFactory::spdy_enabled());
- // Verify that it can be force-enabled too.
+ // If SPDY is disabled (because of command line option), then verify policy
+ // doesn't enable it.
browser()->profile()->GetPrefs()->SetBoolean(prefs::kDisableSpdy, true);
policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY,
POLICY_SCOPE_USER, base::Value::CreateBooleanValue(false));
provider_.UpdateChromePolicy(policies);
content::RunAllPendingInMessageLoop();
- EXPECT_TRUE(net::HttpStreamFactory::spdy_enabled());
+ EXPECT_FALSE(net::HttpStreamFactory::spdy_enabled());
}
IN_PROC_BROWSER_TEST_F(PolicyTest, DisabledPlugins) {
« chrome/browser/net/net_pref_observer.cc ('K') | « chrome/browser/net/net_pref_observer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698