diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 14:30:27 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-11 14:30:27 +0000 |
| commit | a1fc0f7f9f29b20f76d85820036f8482f99eb72f (patch) | |
| tree | a990a72bbe4219ee981830faa8f7b031098295ee | |
| parent | 9080b806f19467f17b1373fed64797e65f4d1c18 (diff) | |
| download | chromium_src-a1fc0f7f9f29b20f76d85820036f8482f99eb72f.zip chromium_src-a1fc0f7f9f29b20f76d85820036f8482f99eb72f.tar.gz chromium_src-a1fc0f7f9f29b20f76d85820036f8482f99eb72f.tar.bz2 | |
Replace gmock's EXPECT_THAT by an explicit check when comparing proxy config in PrefProxyConfigServiceTest.Fallback. This should avoid having gtest print the objects, which results in uninitialized memory accesses.
BUG=None
TEST=builds and makes valgrind bots a bit happier
Review URL: http://codereview.chromium.org/6821044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@81095 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/net/pref_proxy_config_service_unittest.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/browser/net/pref_proxy_config_service_unittest.cc b/chrome/browser/net/pref_proxy_config_service_unittest.cc index e191887..19bb53b 100644 --- a/chrome/browser/net/pref_proxy_config_service_unittest.cc +++ b/chrome/browser/net/pref_proxy_config_service_unittest.cc @@ -234,7 +234,7 @@ TEST_F(PrefProxyConfigServiceTest, Fallback) { Mock::VerifyAndClearExpectations(&observer); EXPECT_EQ(CONFIG_VALID, proxy_config_service_->GetLatestProxyConfig(&actual_config)); - EXPECT_THAT(actual_config, ProxyConfigMatches(recommended_config)); + EXPECT_TRUE(actual_config.Equals(recommended_config)); // Override in user prefs. EXPECT_CALL(observer, @@ -247,7 +247,7 @@ TEST_F(PrefProxyConfigServiceTest, Fallback) { Mock::VerifyAndClearExpectations(&observer); EXPECT_EQ(CONFIG_VALID, proxy_config_service_->GetLatestProxyConfig(&actual_config)); - EXPECT_THAT(actual_config, ProxyConfigMatches(user_config)); + EXPECT_TRUE(actual_config.Equals(user_config)); // Go back to recommended pref. EXPECT_CALL(observer, @@ -258,7 +258,7 @@ TEST_F(PrefProxyConfigServiceTest, Fallback) { Mock::VerifyAndClearExpectations(&observer); EXPECT_EQ(CONFIG_VALID, proxy_config_service_->GetLatestProxyConfig(&actual_config)); - EXPECT_THAT(actual_config, ProxyConfigMatches(recommended_config)); + EXPECT_TRUE(actual_config.Equals(recommended_config)); proxy_config_service_->RemoveObserver(&observer); } |