diff options
author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 06:16:36 +0000 |
---|---|---|
committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-13 06:16:36 +0000 |
commit | a809f9001fd8f66087c6879fb56600c038cfc5fa (patch) | |
tree | a624823759159399d153b8a61eb99bb87ebfa28d /chrome/browser/importer | |
parent | d79a982f4bae3718457555dea55d9a9144b043fc (diff) | |
download | chromium_src-a809f9001fd8f66087c6879fb56600c038cfc5fa.zip chromium_src-a809f9001fd8f66087c6879fb56600c038cfc5fa.tar.gz chromium_src-a809f9001fd8f66087c6879fb56600c038cfc5fa.tar.bz2 |
Emit an event to NetLog whenever the proxy settings change.
Also removes the operator<< on ProxyConfig.
BUG=52004
Review URL: http://codereview.chromium.org/3144008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@55999 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/importer')
-rw-r--r-- | chrome/browser/importer/firefox_proxy_settings_unittest.cc | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/chrome/browser/importer/firefox_proxy_settings_unittest.cc b/chrome/browser/importer/firefox_proxy_settings_unittest.cc index ed2a66c..a1d84c3 100644 --- a/chrome/browser/importer/firefox_proxy_settings_unittest.cc +++ b/chrome/browser/importer/firefox_proxy_settings_unittest.cc @@ -2,8 +2,6 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <sstream> - #include "testing/gtest/include/gtest/gtest.h" #include "base/file_path.h" @@ -56,11 +54,6 @@ TEST_F(FirefoxProxySettingsTest, TestParse) { net::ProxyConfig config; EXPECT_TRUE(settings.ToProxyConfig(&config)); - // Pretty-print |config| to a string (easy way to define the expectations). - std::ostringstream stream; - stream << config; - std::string pretty_printed_config = stream.str(); - EXPECT_EQ( "Automatic settings:\n" " Auto-detect: No\n" @@ -75,7 +68,7 @@ TEST_F(FirefoxProxySettingsTest, TestParse) { " *localhost\n" " 127.0.0.1\n" " *noproxy.com", - pretty_printed_config); + config.ToString()); } TEST_F(FirefoxProxySettingsTest, TestParseAutoConfigUrl) { @@ -108,11 +101,6 @@ TEST_F(FirefoxProxySettingsTest, TestParseAutoConfigUrl) { net::ProxyConfig config; EXPECT_TRUE(settings.ToProxyConfig(&config)); - // Pretty-print |config| to a string (easy way to define the expectations). - std::ostringstream stream; - stream << config; - std::string pretty_printed_config = stream.str(); - EXPECT_EQ( "Automatic settings:\n" " Auto-detect: No\n" @@ -120,5 +108,5 @@ TEST_F(FirefoxProxySettingsTest, TestParseAutoConfigUrl) { "Manual settings:\n" " Proxy server: [None]\n" " Bypass list: [None]", - pretty_printed_config); + config.ToString()); } |