SPDY - disable SPDY based on command line and policy

chrome/browser/policy/policy_browsertest.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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 623 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(PolicyTest, DisableSpdy) {
   // Verifies that SPDY can be disable by policy.
   EXPECT_TRUE(net::HttpStreamFactory::spdy_enabled());
   PolicyMap policies;
   policies.Set(key::kDisableSpdy, POLICY_LEVEL_MANDATORY,
                POLICY_SCOPE_USER, base::Value::CreateBooleanValue(true));
   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) {
   // Verifies that plugins can be forced to be disabled by policy.
 
   // Verify that the Flash plugin exists and that it can be enabled and disabled
   // by the user.
   std::vector<webkit::WebPluginInfo> plugins;
   GetPluginList(&plugins);
   const webkit::WebPluginInfo* flash = GetFlashPlugin(plugins);
@@ skipping 668 matching lines @@
 INSTANTIATE_TEST_CASE_P(
     RestoreOnStartupPolicyTestInstance,
     RestoreOnStartupPolicyTest,
     testing::Values(&RestoreOnStartupPolicyTest::HomepageIsNotNTP,
                     &RestoreOnStartupPolicyTest::HomepageIsNTP,
                     &RestoreOnStartupPolicyTest::ListOfURLs,
                     &RestoreOnStartupPolicyTest::NTP,
                     &RestoreOnStartupPolicyTest::Last));
 
 }  // namespace policy