Move http_server_properties_manager from chrome/browser/net to net/http.

chrome/browser/net/http_server_properties_manager_unittest.cc

Index: chrome/browser/net/http_server_properties_manager_unittest.cc
diff --git a/chrome/browser/net/http_server_properties_manager_unittest.cc b/chrome/browser/net/http_server_properties_manager_unittest.cc
deleted file mode 100644
index fdaee6c1d48d4c0c4324a446efdb3efdb65cf50c..0000000000000000000000000000000000000000
--- a/chrome/browser/net/http_server_properties_manager_unittest.cc
+++ /dev/null
@@ -1,485 +0,0 @@
-// 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 "chrome/browser/net/http_server_properties_manager.h"
-
-#include "base/basictypes.h"
-#include "base/message_loop/message_loop.h"
-#include "base/prefs/pref_registry_simple.h"
-#include "base/prefs/testing_pref_service.h"
-#include "base/values.h"
-#include "chrome/common/pref_names.h"
-#include "content/public/test/test_browser_thread.h"
-#include "testing/gmock/include/gmock/gmock.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
-
-namespace chrome_browser_net {
-
-namespace {
-
-using ::testing::_;
-using ::testing::Invoke;
-using ::testing::Mock;
-using ::testing::StrictMock;
-using content::BrowserThread;
-
-class TestingHttpServerPropertiesManager : public HttpServerPropertiesManager {
- public:
-  explicit TestingHttpServerPropertiesManager(PrefService* pref_service)
-      : HttpServerPropertiesManager(pref_service) {
-    InitializeOnIOThread();
-  }
-
-  virtual ~TestingHttpServerPropertiesManager() {
-  }
-
-  // Make these methods public for testing.
-  using HttpServerPropertiesManager::ScheduleUpdateCacheOnUI;
-  using HttpServerPropertiesManager::ScheduleUpdatePrefsOnIO;
-
-  // Post tasks without a delay during tests.
-  virtual void StartPrefsUpdateTimerOnIO(base::TimeDelta delay) OVERRIDE {
-    HttpServerPropertiesManager::StartPrefsUpdateTimerOnIO(
-        base::TimeDelta());
-  }
-
-  void UpdateCacheFromPrefsOnUIConcrete() {
-    HttpServerPropertiesManager::UpdateCacheFromPrefsOnUI();
-  }
-
-  // Post tasks without a delay during tests.
-  virtual void StartCacheUpdateTimerOnUI(base::TimeDelta delay) OVERRIDE {
-    HttpServerPropertiesManager::StartCacheUpdateTimerOnUI(
-        base::TimeDelta());
-  }
-
-  void UpdatePrefsFromCacheOnIOConcrete(const base::Closure& callback) {
-    HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(callback);
-  }
-
-  MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void());
-  MOCK_METHOD1(UpdatePrefsFromCacheOnIO, void(const base::Closure&));
-  MOCK_METHOD5(UpdateCacheFromPrefsOnIO,
-               void(std::vector<std::string>* spdy_servers,
-                    net::SpdySettingsMap* spdy_settings_map,
-                    net::AlternateProtocolMap* alternate_protocol_map,
-                    net::AlternateProtocolExperiment experiment,
-                    bool detected_corrupted_prefs));
-  MOCK_METHOD3(UpdatePrefsOnUI,
-               void(base::ListValue* spdy_server_list,
-                    net::SpdySettingsMap* spdy_settings_map,
-                    net::AlternateProtocolMap* alternate_protocol_map));
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager);
-};
-
-class HttpServerPropertiesManagerTest : public testing::Test {
- protected:
-  HttpServerPropertiesManagerTest()
-      : ui_thread_(BrowserThread::UI, &loop_),
-        io_thread_(BrowserThread::IO, &loop_) {
-  }
-
-  virtual void SetUp() OVERRIDE {
-    pref_service_.registry()->RegisterDictionaryPref(
-        prefs::kHttpServerProperties);
-    http_server_props_manager_.reset(
-        new StrictMock<TestingHttpServerPropertiesManager>(&pref_service_));
-    ExpectCacheUpdate();
-    loop_.RunUntilIdle();
-  }
-
-  virtual void TearDown() OVERRIDE {
-    if (http_server_props_manager_.get())
-      http_server_props_manager_->ShutdownOnUIThread();
-    loop_.RunUntilIdle();
-    // Delete |http_server_props_manager_| while |io_thread_| is mapping IO to
-    // |loop_|.
-    http_server_props_manager_.reset();
-  }
-
-  void ExpectCacheUpdate() {
-    EXPECT_CALL(*http_server_props_manager_, UpdateCacheFromPrefsOnUI())
-        .WillOnce(
-            Invoke(http_server_props_manager_.get(),
-                   &TestingHttpServerPropertiesManager::
-                   UpdateCacheFromPrefsOnUIConcrete));
-  }
-
-  void ExpectPrefsUpdate() {
-    EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO(_))
-        .WillOnce(
-            Invoke(http_server_props_manager_.get(),
-                   &TestingHttpServerPropertiesManager::
-                   UpdatePrefsFromCacheOnIOConcrete));
-  }
-
-  void ExpectPrefsUpdateRepeatedly() {
-    EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO(_))
-        .WillRepeatedly(
-            Invoke(http_server_props_manager_.get(),
-                   &TestingHttpServerPropertiesManager::
-                   UpdatePrefsFromCacheOnIOConcrete));
-  }
-
-  base::MessageLoop loop_;
-  TestingPrefServiceSimple pref_service_;
-  scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_;
-
- private:
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread io_thread_;
-
-  DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest);
-};
-
-TEST_F(HttpServerPropertiesManagerTest,
-       SingleUpdateForTwoSpdyServerPrefChanges) {
-  ExpectCacheUpdate();
-
-  // Set up the prefs for www.google.com:80 and mail.google.com:80 and then set
-  // it twice. Only expect a single cache update.
-
-  base::DictionaryValue* server_pref_dict = new base::DictionaryValue;
-
-  // Set supports_spdy for www.google.com:80.
-  server_pref_dict->SetBoolean("supports_spdy", true);
-
-  // Set up alternate_protocol for www.google.com:80.
-  base::DictionaryValue* alternate_protocol = new base::DictionaryValue;
-  alternate_protocol->SetInteger("port", 443);
-  alternate_protocol->SetString("protocol_str", "npn-spdy/3");
-  server_pref_dict->SetWithoutPathExpansion(
-      "alternate_protocol", alternate_protocol);
-
-  // Set the server preference for www.google.com:80.
-  base::DictionaryValue* servers_dict = new base::DictionaryValue;
-  servers_dict->SetWithoutPathExpansion(
-      "www.google.com:80", server_pref_dict);
-
-  // Set the preference for mail.google.com server.
-  base::DictionaryValue* server_pref_dict1 = new base::DictionaryValue;
-
-  // Set supports_spdy for mail.google.com:80
-  server_pref_dict1->SetBoolean("supports_spdy", true);
-
-  // Set up alternate_protocol for mail.google.com:80
-  base::DictionaryValue* alternate_protocol1 = new base::DictionaryValue;
-  alternate_protocol1->SetInteger("port", 444);
-  alternate_protocol1->SetString("protocol_str", "npn-spdy/3.1");
-
-  server_pref_dict1->SetWithoutPathExpansion(
-      "alternate_protocol", alternate_protocol1);
-
-  // Set the server preference for mail.google.com:80.
-  servers_dict->SetWithoutPathExpansion(
-      "mail.google.com:80", server_pref_dict1);
-
-  base::DictionaryValue* http_server_properties_dict =
-      new base::DictionaryValue;
-  HttpServerPropertiesManager::SetVersion(http_server_properties_dict, -1);
-  http_server_properties_dict->SetWithoutPathExpansion("servers", servers_dict);
-
-  // Set the same value for kHttpServerProperties multiple times.
-  pref_service_.SetManagedPref(prefs::kHttpServerProperties,
-                               http_server_properties_dict);
-  base::DictionaryValue* http_server_properties_dict2 =
-      http_server_properties_dict->DeepCopy();
-  pref_service_.SetManagedPref(prefs::kHttpServerProperties,
-                               http_server_properties_dict2);
-
-  loop_.RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-
-  // Verify SupportsSpdy.
-  EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
-      net::HostPortPair::FromString("www.google.com:80")));
-  EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(
-      net::HostPortPair::FromString("mail.google.com:80")));
-  EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(
-      net::HostPortPair::FromString("foo.google.com:1337")));
-
-  // Verify AlternateProtocol.
-  ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
-      net::HostPortPair::FromString("www.google.com:80")));
-  ASSERT_TRUE(http_server_props_manager_->HasAlternateProtocol(
-      net::HostPortPair::FromString("mail.google.com:80")));
-  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_3, 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_3_1, port_alternate_protocol.protocol);
-}
-
-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));
-  http_server_props_manager_->SetSupportsSpdy(spdy_server_mail, true);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-}
-
-TEST_F(HttpServerPropertiesManagerTest, SetSpdySetting) {
-  ExpectPrefsUpdate();
-
-  // Add SpdySetting for mail.google.com:443.
-  net::HostPortPair spdy_server_mail("mail.google.com", 443);
-  const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
-  const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
-  http_server_props_manager_->SetSpdySetting(
-      spdy_server_mail, id1, flags1, value1);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  const net::SettingsMap& settings_map1_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, settings_map1_ret.size());
-  net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
-  EXPECT_TRUE(it1_ret != settings_map1_ret.end());
-  net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
-  EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
-  EXPECT_EQ(value1, flags_and_value1_ret.second);
-
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ClearSpdySetting) {
-  ExpectPrefsUpdateRepeatedly();
-
-  // Add SpdySetting for mail.google.com:443.
-  net::HostPortPair spdy_server_mail("mail.google.com", 443);
-  const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
-  const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
-  http_server_props_manager_->SetSpdySetting(
-      spdy_server_mail, id1, flags1, value1);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  const net::SettingsMap& settings_map1_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, settings_map1_ret.size());
-  net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
-  EXPECT_TRUE(it1_ret != settings_map1_ret.end());
-  net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
-  EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
-  EXPECT_EQ(value1, flags_and_value1_ret.second);
-
-  // Clear SpdySetting for mail.google.com:443.
-  http_server_props_manager_->ClearSpdySettings(spdy_server_mail);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  // Verify that there are no entries in the settings map for
-  // mail.google.com:443.
-  const net::SettingsMap& settings_map2_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(0U, settings_map2_ret.size());
-
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ClearAllSpdySetting) {
-  ExpectPrefsUpdateRepeatedly();
-
-  // Add SpdySetting for mail.google.com:443.
-  net::HostPortPair spdy_server_mail("mail.google.com", 443);
-  const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
-  const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
-  http_server_props_manager_->SetSpdySetting(
-      spdy_server_mail, id1, flags1, value1);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  const net::SettingsMap& settings_map1_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, settings_map1_ret.size());
-  net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
-  EXPECT_TRUE(it1_ret != settings_map1_ret.end());
-  net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
-  EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
-  EXPECT_EQ(value1, flags_and_value1_ret.second);
-
-  // Clear All SpdySettings.
-  http_server_props_manager_->ClearAllSpdySettings();
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  // Verify that there are no entries in the settings map.
-  const net::SpdySettingsMap& spdy_settings_map2_ret =
-      http_server_props_manager_->spdy_settings_map();
-  ASSERT_EQ(0U, spdy_settings_map2_ret.size());
-
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-}
-
-TEST_F(HttpServerPropertiesManagerTest, HasAlternateProtocol) {
-  ExpectPrefsUpdate();
-
-  net::HostPortPair spdy_server_mail("mail.google.com", 80);
-  EXPECT_FALSE(
-      http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-  http_server_props_manager_->SetAlternateProtocol(
-      spdy_server_mail, 443, net::NPN_SPDY_3);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-  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_3, port_alternate_protocol.protocol);
-}
-
-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_3);
-
-  const net::SpdySettingsIds id1 = net::SETTINGS_UPLOAD_BANDWIDTH;
-  const net::SpdySettingsFlags flags1 = net::SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
-  http_server_props_manager_->SetSpdySetting(
-      spdy_server_mail, id1, flags1, value1);
-
-  // Run the task.
-  loop_.RunUntilIdle();
-
-  EXPECT_TRUE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
-  EXPECT_TRUE(
-      http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-
-  // Check SPDY settings values.
-  const net::SettingsMap& settings_map1_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  ASSERT_EQ(1U, settings_map1_ret.size());
-  net::SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
-  EXPECT_TRUE(it1_ret != settings_map1_ret.end());
-  net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
-  EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
-  EXPECT_EQ(value1, flags_and_value1_ret.second);
-
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-
-  ExpectPrefsUpdate();
-
-  // Clear http server data, time out if we do not get a completion callback.
-  http_server_props_manager_->Clear(base::MessageLoop::QuitClosure());
-  loop_.Run();
-
-  EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
-  EXPECT_FALSE(
-      http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
-
-  const net::SettingsMap& settings_map2_ret =
-      http_server_props_manager_->GetSpdySettings(spdy_server_mail);
-  EXPECT_EQ(0U, settings_map2_ret.size());
-
-  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.
-  loop_.RunUntilIdle();
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache1) {
-  // Post an update task.
-  http_server_props_manager_->ScheduleUpdateCacheOnUI();
-  // Shutdown comes before the task is executed.
-  http_server_props_manager_->ShutdownOnUIThread();
-  // Run the task after shutdown, but before deletion.
-  loop_.RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-  http_server_props_manager_.reset();
-  loop_.RunUntilIdle();
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdateCache2) {
-  http_server_props_manager_->UpdateCacheFromPrefsOnUIConcrete();
-  // Shutdown comes before the task is executed.
-  http_server_props_manager_->ShutdownOnUIThread();
-  // Run the task after shutdown, but before deletion.
-  loop_.RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-  http_server_props_manager_.reset();
-  loop_.RunUntilIdle();
-}
-
-//
-// Tests for shutdown when updating prefs.
-//
-TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs0) {
-  // Post an update task to the IO thread.
-  http_server_props_manager_->ScheduleUpdatePrefsOnIO();
-  // Shutdown comes before the task is executed.
-  http_server_props_manager_->ShutdownOnUIThread();
-  http_server_props_manager_.reset();
-  // Run the task after shutdown and deletion.
-  loop_.RunUntilIdle();
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs1) {
-  ExpectPrefsUpdate();
-  // Post an update task.
-  http_server_props_manager_->ScheduleUpdatePrefsOnIO();
-  // Shutdown comes before the task is executed.
-  http_server_props_manager_->ShutdownOnUIThread();
-  // Run the task after shutdown, but before deletion.
-  loop_.RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-  http_server_props_manager_.reset();
-  loop_.RunUntilIdle();
-}
-
-TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs2) {
-  // This posts a task to the UI thread.
-  http_server_props_manager_->UpdatePrefsFromCacheOnIOConcrete(base::Closure());
-  // Shutdown comes before the task is executed.
-  http_server_props_manager_->ShutdownOnUIThread();
-  // Run the task after shutdown, but before deletion.
-  loop_.RunUntilIdle();
-  Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
-  http_server_props_manager_.reset();
-  loop_.RunUntilIdle();
-}
-
-}  // namespace
-
-}  // namespace chrome_browser_net