diff options
| author | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:47:00 +0000 |
|---|---|---|
| committer | rtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-17 21:47:00 +0000 |
| commit | 3b543ab59106f2f889df2412766572836d408bd4 (patch) | |
| tree | 40a0dad0517dcad5b1738cf3df2e117e3ccc80fd /net/base/sdch_filter_unittest.cc | |
| parent | 60fbffba562e633360f25b7a507d3bf1dedcb0e1 (diff) | |
| download | chromium_src-3b543ab59106f2f889df2412766572836d408bd4.zip chromium_src-3b543ab59106f2f889df2412766572836d408bd4.tar.gz chromium_src-3b543ab59106f2f889df2412766572836d408bd4.tar.bz2 | |
Moved SDCH initialization from UI thread to IO thread.
Removed enabling of SDCH per domain. Added -disable-sdch
to disable SDCH. SDCH is eanbled by default.
BUG=96455
TEST=network unit tests and sdch testing
R=jar
Review URL: http://codereview.chromium.org/7891069
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@101661 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/sdch_filter_unittest.cc')
| -rw-r--r-- | net/base/sdch_filter_unittest.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/base/sdch_filter_unittest.cc b/net/base/sdch_filter_unittest.cc index 9c97f86..1f28de5 100644 --- a/net/base/sdch_filter_unittest.cc +++ b/net/base/sdch_filter_unittest.cc @@ -61,7 +61,6 @@ class SdchFilterTest : public testing::Test { sizeof(kSdchCompressedTestData) - 1), expanded_(kTestData, sizeof(kTestData) - 1), sdch_manager_(new SdchManager) { - sdch_manager_->EnableSdchSupport(""); } std::string NewSdchCompressedData(const std::string dictionary); @@ -1147,13 +1146,11 @@ TEST_F(SdchFilterTest, AcceptGzipGzipSdchIfGzip) { } TEST_F(SdchFilterTest, DomainSupported) { - GURL test_url("http://www.test.com"); GURL google_url("http://www.google.com"); - EXPECT_TRUE(SdchManager::sdch_enabled()); - EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(test_url)); - sdch_manager_->EnableSdchSupport(".google.com"); - EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(test_url)); + net::SdchManager::EnableSdchSupport(false); + EXPECT_FALSE(SdchManager::Global()->IsInSupportedDomain(google_url)); + net::SdchManager::EnableSdchSupport(true); EXPECT_TRUE(SdchManager::Global()->IsInSupportedDomain(google_url)); } |