summaryrefslogtreecommitdiffstats
path: root/net/url_request/url_request_throttler_unittest.cc
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 15:46:25 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 15:46:25 +0000
commit07df8505604b5d585d024ace633e3e6454cfa3b9 (patch)
treec5e022ccb67a1a21df1323f08817fc2aea621240 /net/url_request/url_request_throttler_unittest.cc
parent7d3f7fca548048027905f1ceabdaa62d6f179faa (diff)
downloadchromium_src-07df8505604b5d585d024ace633e3e6454cfa3b9.zip
chromium_src-07df8505604b5d585d024ace633e3e6454cfa3b9.tar.gz
chromium_src-07df8505604b5d585d024ace633e3e6454cfa3b9.tar.bz2
Remove minidump analysis aides from URLRequestThrottlerManager. Leave
in guard against null values. We are no longer getting any new information from more minidumps for this particular crash, so the aides are no longer necessary and I'm leaving the guard in place to minimize the impact on our users. BUG=71721 TEST=net_unittests Review URL: http://codereview.chromium.org/6698033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request/url_request_throttler_unittest.cc')
-rw-r--r--net/url_request/url_request_throttler_unittest.cc29
1 files changed, 9 insertions, 20 deletions
diff --git a/net/url_request/url_request_throttler_unittest.cc b/net/url_request/url_request_throttler_unittest.cc
index 4aed38c..febc69c 100644
--- a/net/url_request/url_request_throttler_unittest.cc
+++ b/net/url_request/url_request_throttler_unittest.cc
@@ -333,26 +333,25 @@ TEST(URLRequestThrottlerManager, IsUrlStandardised) {
MockURLRequestThrottlerManager manager;
GurlAndString test_values[] = {
GurlAndString(GURL("http://www.example.com"),
- std::string("GOOGYhttp://www.example.com/MONSTA"),
+ std::string("http://www.example.com/"),
__LINE__),
GurlAndString(GURL("http://www.Example.com"),
- std::string("GOOGYhttp://www.example.com/MONSTA"),
+ std::string("http://www.example.com/"),
__LINE__),
GurlAndString(GURL("http://www.ex4mple.com/Pr4c71c41"),
- std::string("GOOGYhttp://www.ex4mple.com/pr4c71c41MONSTA"),
+ std::string("http://www.ex4mple.com/pr4c71c41"),
+ __LINE__),
+ GurlAndString(GURL("http://www.example.com/0/token/false"),
+ std::string("http://www.example.com/0/token/false"),
__LINE__),
- GurlAndString(
- GURL("http://www.example.com/0/token/false"),
- std::string("GOOGYhttp://www.example.com/0/token/falseMONSTA"),
- __LINE__),
GurlAndString(GURL("http://www.example.com/index.php?code=javascript"),
- std::string("GOOGYhttp://www.example.com/index.phpMONSTA"),
+ std::string("http://www.example.com/index.php"),
__LINE__),
GurlAndString(GURL("http://www.example.com/index.php?code=1#superEntry"),
- std::string("GOOGYhttp://www.example.com/index.phpMONSTA"),
+ std::string("http://www.example.com/index.php"),
__LINE__),
GurlAndString(GURL("http://www.example.com:1234/"),
- std::string("GOOGYhttp://www.example.com:1234/MONSTA"),
+ std::string("http://www.example.com:1234/"),
__LINE__)};
for (unsigned int i = 0; i < arraysize(test_values); ++i) {
@@ -390,13 +389,3 @@ TEST(URLRequestThrottlerManager, IsHostBeingRegistered) {
EXPECT_EQ(3, manager.GetNumberOfEntries());
}
-
-#if defined(GTEST_HAS_DEATH_TEST)
-TEST(URLRequestThrottlerManager, NullHandlingTest) {
- MockURLRequestThrottlerManager manager;
- manager.OverrideEntryForTests(GURL("http://www.foo.com/"), NULL);
- ASSERT_DEATH({
- manager.DoGarbageCollectEntries();
- }, "");
-}
-#endif // defined(GTEST_HAS_DEATH_TEST)