Save pipelining capabilities for the most used hosts between sessions.

chrome/browser/net/http_server_properties_manager_unittest.cc

 // Copyright (c) 2011 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 "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
@@ skipping 45 matching lines @@
 
   void UpdatePrefsFromCacheOnIOConcrete() {
     HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO();
   }
 
   MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void());
   MOCK_METHOD0(UpdatePrefsFromCacheOnIO, void());
   MOCK_METHOD3(UpdateCacheFromPrefsOnIO,
                void(std::vector<std::string>* spdy_servers,
                     net::SpdySettingsMap* spdy_settings_map,
                     net::AlternateProtocolMap* alternate_protocol_map));

[ramant (doing other things), 2011/12/03 00:31:43]

shouldn't we add PipelineCapability to UpdateCacheFromPrefsOnIO

[James Simonsen, 2011/12/03 03:16:00]

Done.

It's disconcerting that this compiled and all the tests passed.

   MOCK_METHOD3(UpdatePrefsOnUI,
                void(base::ListValue* spdy_server_list,
                     net::SpdySettingsMap* spdy_settings_map,
                     net::AlternateProtocolMap* alternate_protocol_map));

[ramant (doing other things), 2011/12/03 00:31:43]

shouldn't we add PipelineCapability to UpdateCacheFromPrefsOnIO

[James Simonsen, 2011/12/03 03:16:00]

Done.

 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager);
 };
 
 class HttpServerPropertiesManagerTest : public testing::Test {
  protected:
   HttpServerPropertiesManagerTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {
@@ skipping 150 matching lines @@
   net::PortAlternateProtocolPair port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("www.google.com:80"));
   EXPECT_EQ(443, port_alternate_protocol.port);
   EXPECT_EQ(net::NPN_SPDY_1, port_alternate_protocol.protocol);
   port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(
           net::HostPortPair::FromString("mail.google.com:80"));
   EXPECT_EQ(444, port_alternate_protocol.port);
   EXPECT_EQ(net::NPN_SPDY_2, port_alternate_protocol.protocol);
 }

[ramant (doing other things), 2011/12/03 00:31:43]

nit: please consider adding a test for PipelineCapability

[James Simonsen, 2011/12/03 03:16:00]

Done.

 
 TEST_F(HttpServerPropertiesManagerTest, SupportsSpdy) {
   ExpectPrefsUpdate();
 
   // Post an update task to the IO thread. SetSupportsSpdy calls
   // ScheduleUpdatePrefsOnIO.
 
   // Add mail.google.com:443 as a supporting spdy server.
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
@@ skipping 47 matching lines @@
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ASSERT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
   net::PortAlternateProtocolPair port_alternate_protocol =
       http_server_props_manager_->GetAlternateProtocol(spdy_server_mail);
   EXPECT_EQ(443, port_alternate_protocol.port);
   EXPECT_EQ(net::NPN_SPDY_2, port_alternate_protocol.protocol);
 }
 
+TEST_F(HttpServerPropertiesManagerTest, PipelineCapability) {
+  ExpectPrefsUpdate();
+
+  // Post an update task to the IO thread. SetPipelineCapability calls
+  // ScheduleUpdatePrefsOnIO.

[mmenke, 2011/12/02 21:52:10]

Think it's a little clearer if you put this just above the calls to
SetPipelineCapability, but up to you.

[James Simonsen, 2011/12/03 03:16:00]

Done.

+
+  net::HostPortPair known_pipeliner("pipeline.com", 8080);
+  net::HostPortPair bad_pipeliner("wordpress.com", 80);
+  EXPECT_EQ(net::HttpPipelinedHost::UNKNOWN,
+            http_server_props_manager_->GetPipelineCapability(known_pipeliner));
+  EXPECT_EQ(net::HttpPipelinedHost::UNKNOWN,
+            http_server_props_manager_->GetPipelineCapability(bad_pipeliner));
+  http_server_props_manager_->SetPipelineCapability(
+      known_pipeliner, net::HttpPipelinedHost::CAPABLE);
+  http_server_props_manager_->SetPipelineCapability(
+      bad_pipeliner, net::HttpPipelinedHost::INCAPABLE);
+
+  // Run the task.
+  loop_.RunAllPending();
+
+  EXPECT_EQ(net::HttpPipelinedHost::CAPABLE,
+            http_server_props_manager_->GetPipelineCapability(known_pipeliner));
+  EXPECT_EQ(net::HttpPipelinedHost::INCAPABLE,
+            http_server_props_manager_->GetPipelineCapability(bad_pipeliner));
+  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
+}
+
 TEST_F(HttpServerPropertiesManagerTest, Clear) {
   ExpectPrefsUpdate();
 
   net::HostPortPair spdy_server_mail("mail.google.com", 443);
   http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
   http_server_props_manager_->SetAlternateProtocol(
       spdy_server_mail, 443, net::NPN_SPDY_2);
 
   spdy::SpdySettings spdy_settings;
   spdy::SettingsFlagsAndId id1(0);
   id1.set_flags(spdy::SETTINGS_FLAG_PLEASE_PERSIST);
   id1.set_id(1234);
   spdy_settings.push_back(std::make_pair(id1, 31337));
   http_server_props_manager_->SetSpdySettings(spdy_server_mail, spdy_settings);
 
+  net::HostPortPair known_pipeliner("pipeline.com", 8080);
+  http_server_props_manager_->SetPipelineCapability(
+      known_pipeliner, net::HttpPipelinedHost::CAPABLE);
+
   // Run the task.
   loop_.RunAllPending();
 
   EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   EXPECT_TRUE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
   spdy::SpdySettings spdy_settings_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   ASSERT_EQ(1U, spdy_settings_ret.size());
   spdy::SpdySetting spdy_setting1_ret = spdy_settings_ret.front();
   spdy::SettingsFlagsAndId id1_ret(spdy_setting1_ret.first);
   EXPECT_EQ(1234U, id1_ret.id());
   EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, id1_ret.flags());
   EXPECT_EQ(31337U, spdy_setting1_ret.second);
 
+  EXPECT_EQ(net::HttpPipelinedHost::CAPABLE,
+            http_server_props_manager_->GetPipelineCapability(known_pipeliner));
+
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ExpectPrefsUpdate();
   // Clear http server data.
   http_server_props_manager_->Clear();
 
   // Run the task.
   loop_.RunAllPending();
 
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
   spdy::SpdySettings spdy_settings1_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
   EXPECT_EQ(0U, spdy_settings1_ret.size());
 
+  EXPECT_EQ(net::HttpPipelinedHost::UNKNOWN,
+            http_server_props_manager_->GetPipelineCapability(known_pipeliner));
+
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache0) {
   // Post an update task to the UI thread.
   http_server_props_manager_->ScheduleUpdateCacheOnUI();
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   http_server_props_manager_.reset();
   // Run the task after shutdown and deletion.
@@ skipping 57 matching lines @@
   // Run the task after shutdown, but before deletion.
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunAllPending();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net