Keep only base/extractor.[cc|h].

net/network_config_unittest.cc

Index: net/network_config_unittest.cc
diff --git a/net/network_config_unittest.cc b/net/network_config_unittest.cc
deleted file mode 100644
index 68b958b3f29cfb185b1660163a8fe33a5e7cd84f..0000000000000000000000000000000000000000
--- a/net/network_config_unittest.cc
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright 2007-2009 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-// ========================================================================
-
-#include <windows.h>
-#include <atlconv.h>
-#include <algorithm>
-#include <cstring>
-#include "base/basictypes.h"
-#include "omaha/base/module_utils.h"
-#include "omaha/base/omaha_version.h"
-#include "omaha/base/reg_key.h"
-#include "omaha/base/utils.h"
-#include "omaha/base/vistautil.h"
-#include "omaha/net/cup_request.h"
-#include "omaha/net/cup_utils.h"
-#include "omaha/net/http_client.h"
-#include "omaha/net/network_config.h"
-#include "omaha/testing/unit_test.h"
-
-namespace omaha {
-
-class NetworkConfigTest : public testing::Test {
- protected:
-  NetworkConfigTest() {}
-
-  static void SetUpTestCase() {}
-
-  static void TearDownTestCase() {}
-
-  virtual void SetUp() {}
-
-  virtual void TearDown() {}
-};
-
-TEST_F(NetworkConfigTest, GetAccessType) {
-  EXPECT_EQ(NetworkConfig::GetAccessType(ProxyConfig()),
-            WINHTTP_ACCESS_TYPE_NO_PROXY);
-
-  ProxyConfig config;
-  config.auto_detect = true;
-  EXPECT_EQ(NetworkConfig::GetAccessType(config),
-            WINHTTP_ACCESS_TYPE_AUTO_DETECT);
-
-  config = ProxyConfig();
-  config.auto_config_url = _T("http://foo");
-  EXPECT_EQ(NetworkConfig::GetAccessType(config),
-            WINHTTP_ACCESS_TYPE_AUTO_DETECT);
-
-  config = ProxyConfig();
-  config.auto_detect = true;
-  config.proxy = _T("foo");
-  EXPECT_EQ(NetworkConfig::GetAccessType(config),
-            WINHTTP_ACCESS_TYPE_AUTO_DETECT);
-
-  config = ProxyConfig();
-  config.proxy = _T("foo");
-  EXPECT_EQ(NetworkConfig::GetAccessType(config),
-            WINHTTP_ACCESS_TYPE_NAMED_PROXY);
-}
-
-TEST_F(NetworkConfigTest, CupCredentials) {
-  NetworkConfig* network_config = NULL;
-  EXPECT_HRESULT_SUCCEEDED(
-      NetworkConfigManager::Instance().GetUserNetworkConfig(&network_config));
-  EXPECT_HRESULT_SUCCEEDED(network_config->SetCupCredentials(NULL));
-
-  CupCredentials cup_credentials1;
-  EXPECT_HRESULT_FAILED(network_config->GetCupCredentials(&cup_credentials1));
-
-  // Start with some random bytes. Persist them as sk and as B64-encoded c.
-  // Read back and verify they match.
-  uint8 data[20] = {0};
-  EXPECT_TRUE(GenRandom(data, arraysize(data)));
-
-  const uint8* first = data;
-  const uint8* last  = data + arraysize(data);
-  cup_credentials1.sk.insert(cup_credentials1.sk.begin(), first, last);
-  cup_credentials1.c = cup_utils::B64Encode(data, arraysize(data));
-
-  EXPECT_HRESULT_SUCCEEDED(
-      network_config->SetCupCredentials(&cup_credentials1));
-
-  CupCredentials cup_credentials2;
-  EXPECT_HRESULT_SUCCEEDED(
-      network_config->GetCupCredentials(&cup_credentials2));
-  EXPECT_EQ(cup_credentials1.sk.size(), cup_credentials2.sk.size());
-  EXPECT_TRUE(memcmp(&cup_credentials1.sk.front(),
-                     &cup_credentials2.sk.front(),
-                     cup_credentials1.sk.size()) == 0);
-  EXPECT_STREQ(cup_credentials1.c, cup_credentials2.c);
-
-  EXPECT_HRESULT_SUCCEEDED(network_config->SetCupCredentials(NULL));
-  EXPECT_HRESULT_FAILED(network_config->GetCupCredentials(&cup_credentials1));
-}
-
-TEST_F(NetworkConfigTest, JoinStrings) {
-  EXPECT_STREQ(NetworkConfig::JoinStrings(NULL, NULL, NULL), _T(""));
-
-  CString result;
-  EXPECT_STREQ(NetworkConfig::JoinStrings(NULL, NULL, _T("-")), _T("-"));
-  EXPECT_STREQ(NetworkConfig::JoinStrings(_T("foo"), _T("bar"), _T("-")),
-                                          _T("foo-bar"));
-}
-
-TEST_F(NetworkConfigTest, GetUserAgentTest) {
-  CString version(GetVersionString());
-  EXPECT_FALSE(version.IsEmpty());
-  CString actual_user_agent(NetworkConfig::GetUserAgent());
-  CString expected_user_agent;
-  expected_user_agent.Format(_T("Google Update/%s"), version);
-  EXPECT_STREQ(actual_user_agent, expected_user_agent);
-}
-
-// Hosts names used in the test are only used as string literals.
-TEST_F(NetworkConfigTest, RemoveDuplicates) {
-  // 'source' is not considered in the hash computation.
-  std::vector<ProxyConfig> configurations;
-  ProxyConfig cfg1;
-  cfg1.source = "foo";
-  ProxyConfig cfg2;
-  cfg2.source = "bar";
-  configurations.push_back(cfg1);
-  configurations.push_back(cfg2);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(1, configurations.size());
-  configurations.clear();
-
-  // Remove redundant direct connection configurations.
-  ProxyConfig direct_config;
-  configurations.push_back(direct_config);
-  configurations.push_back(direct_config);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(1, configurations.size());
-  configurations.clear();
-
-  // Remove redundant WPAD configurations.
-  ProxyConfig wpad_config;
-  wpad_config.auto_detect = true;
-  configurations.push_back(wpad_config);
-  configurations.push_back(wpad_config);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(1, configurations.size());
-  configurations.clear();
-
-  // Remove redundant WPAD with auto config url configurations.
-  ProxyConfig wpad_url_config;
-  wpad_url_config.auto_detect = true;
-  wpad_url_config.auto_config_url = _T("http://www.google.com/wpad.dat");
-  configurations.push_back(wpad_url_config);
-  configurations.push_back(wpad_url_config);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(1, configurations.size());
-  configurations.clear();
-
-  // Remove redundant named proxy configurations.
-  ProxyConfig named_proxy_config;
-  named_proxy_config.proxy = _T("www1.google.com:3128");
-  configurations.push_back(named_proxy_config);
-  configurations.push_back(named_proxy_config);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(1, configurations.size());
-  configurations.clear();
-
-  // Does not remove distinct configurations.
-  ProxyConfig named_proxy_config_alt;
-  named_proxy_config_alt.proxy = _T("www2.google.com:3128");
-  configurations.push_back(named_proxy_config);
-  configurations.push_back(named_proxy_config_alt);
-  configurations.push_back(direct_config);
-  configurations.push_back(wpad_config);
-  configurations.push_back(wpad_url_config);
-  NetworkConfig::RemoveDuplicates(&configurations);
-  EXPECT_EQ(5, configurations.size());
-}
-
-TEST_F(NetworkConfigTest, ParseNetConfig) {
-  ProxyConfig config = NetworkConfig::ParseNetConfig(_T(""));
-  EXPECT_EQ(false, config.auto_detect);
-  EXPECT_EQ(true,  config.auto_config_url.IsEmpty());
-  EXPECT_EQ(true,  config.proxy.IsEmpty());
-
-  config = NetworkConfig::ParseNetConfig(_T("wpad=false"));
-  EXPECT_EQ(false, config.auto_detect);
-  EXPECT_EQ(true,  config.auto_config_url.IsEmpty());
-  EXPECT_EQ(true,  config.proxy.IsEmpty());
-
-  config = NetworkConfig::ParseNetConfig(_T("wpad=true"));
-  EXPECT_EQ(true,  config.auto_detect);
-  EXPECT_EQ(true,  config.auto_config_url.IsEmpty());
-  EXPECT_EQ(true,  config.proxy.IsEmpty());
-
-  config = NetworkConfig::ParseNetConfig(_T("script=foo;proxy=bar"));
-  EXPECT_EQ(false, config.auto_detect);
-  EXPECT_STREQ(_T("foo"), config.auto_config_url);
-  EXPECT_EQ(_T("bar"), config.proxy);
-
-  config = NetworkConfig::ParseNetConfig(_T("proxy=foobar"));
-  EXPECT_EQ(false, config.auto_detect);
-  EXPECT_EQ(true, config.auto_config_url.IsEmpty());
-  EXPECT_EQ(_T("foobar"), config.proxy);
-}
-
-TEST_F(NetworkConfigTest, ConfigurationOverride) {
-  NetworkConfig* network_config = NULL;
-  EXPECT_HRESULT_SUCCEEDED(
-      NetworkConfigManager::Instance().GetUserNetworkConfig(&network_config));
-
-  ProxyConfig actual, expected;
-  expected.auto_detect = true;
-  network_config->SetConfigurationOverride(&expected);
-  EXPECT_HRESULT_SUCCEEDED(network_config->GetConfigurationOverride(&actual));
-  EXPECT_EQ(expected.auto_detect, actual.auto_detect);
-
-  network_config->SetConfigurationOverride(NULL);
-  EXPECT_EQ(E_FAIL, network_config->GetConfigurationOverride(&actual));
-}
-
-TEST_F(NetworkConfigTest, GetProxyForUrlLocal) {
-  TCHAR module_directory[MAX_PATH] = {0};
-  ASSERT_TRUE(GetModuleDirectory(NULL, module_directory));
-  CString pac_file_path;
-  pac_file_path.Format(_T("%s\\unittest_support\\localproxytest.pac"),
-                       module_directory);
-
-  HttpClient::ProxyInfo proxy_info = {};
-
-  // The PAC file should emit a preset response for any URL with a hostname
-  // matching *.omahaproxytest.com and DIRECT otherwise.
-
-  EXPECT_HRESULT_SUCCEEDED(NetworkConfig::GetProxyForUrlLocal(
-    _T("http://regex.matches.domain.omahaproxytest.com/test_url/index.html"),
-    pac_file_path, &proxy_info));
-  EXPECT_EQ(WINHTTP_ACCESS_TYPE_NAMED_PROXY, proxy_info.access_type);
-  EXPECT_STREQ(_T("omaha_unittest1;omaha_unittest2:8080"),
-               CString(proxy_info.proxy));
-  EXPECT_EQ(NULL, proxy_info.proxy_bypass);
-
-  if (proxy_info.proxy) {
-    ::GlobalFree(const_cast<TCHAR*>(proxy_info.proxy));
-  }
-  if (proxy_info.proxy_bypass) {
-    ::GlobalFree(const_cast<TCHAR*>(proxy_info.proxy_bypass));
-  }
-
-  EXPECT_HRESULT_SUCCEEDED(NetworkConfig::GetProxyForUrlLocal(
-    _T("http://should.not.match.domain.example.com/test_url/index.html"),
-    pac_file_path, &proxy_info));
-  EXPECT_EQ(WINHTTP_ACCESS_TYPE_NO_PROXY, proxy_info.access_type);
-  EXPECT_EQ(NULL, proxy_info.proxy);
-  EXPECT_EQ(NULL, proxy_info.proxy_bypass);
-}
-
-class NetworkConfigManagerTest : public testing::Test {
- protected:
-  NetworkConfigManagerTest() {}
-
-  static void SetUpTestCase() {}
-
-  static void TearDownTestCase() {}
-
-  virtual void SetUp() {
-    NetworkConfigManager::Instance().ClearCupCredentials();
-  }
-
-  virtual void TearDown() {
-    NetworkConfigManager::Instance().ClearCupCredentials();
-  }
-};
-
-TEST_F(NetworkConfigManagerTest, CupCredentials) {
-  NetworkConfigManager& ncm(NetworkConfigManager::Instance());
-
-  CupCredentials cup_credentials;
-  EXPECT_EQ(E_INVALIDARG, ncm.SetCupCredentials(cup_credentials));
-
-  ncm.ClearCupCredentials();
-
-  EXPECT_EQ(HRESULT_FROM_WIN32(ERROR_NOT_FOUND),
-            ncm.GetCupCredentials(&cup_credentials));
-
-  const int kKeySizeBytes = 16;
-  cup_credentials.sk.resize(kKeySizeBytes);
-  EXPECT_TRUE(GenRandom(&cup_credentials.sk.front(),
-                         cup_credentials.sk.size()));
-  cup_credentials.c = "a cookie";
-
-  EXPECT_HRESULT_SUCCEEDED(ncm.SetCupCredentials(cup_credentials));
-
-  CupCredentials actual_cup_credentials;
-  EXPECT_HRESULT_SUCCEEDED(ncm.GetCupCredentials(&actual_cup_credentials));
-
-  EXPECT_TRUE(std::equal(actual_cup_credentials.sk.begin(),
-                         actual_cup_credentials.sk.end(),
-                         cup_credentials.sk.begin()));
-  EXPECT_STREQ(actual_cup_credentials.c, cup_credentials.c);
-}
-
-}  // namespace omaha
-