summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 22:06:48 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-12-17 22:06:48 +0000
commit7a132124222851a65853386c04fd447c4416d7a0 (patch)
tree941522b0f0d61d956e3f6e84b9cc4b3acda4095b /net
parent2d75e49311c7be4dfd8f52612c9bbda20283811d (diff)
downloadchromium_src-7a132124222851a65853386c04fd447c4416d7a0.zip
chromium_src-7a132124222851a65853386c04fd447c4416d7a0.tar.gz
chromium_src-7a132124222851a65853386c04fd447c4416d7a0.tar.bz2
Mark MessageLoop::delayed_work_queue_ as initialized so Purify doesn't report any UMRs when reading its comparator.
BUG=5555 Review URL: http://codereview.chromium.org/14810 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/proxy/proxy_script_fetcher.h4
-rw-r--r--net/proxy/proxy_script_fetcher_unittest.cc12
2 files changed, 8 insertions, 8 deletions
diff --git a/net/proxy/proxy_script_fetcher.h b/net/proxy/proxy_script_fetcher.h
index 3792cab..fddbd7b 100644
--- a/net/proxy/proxy_script_fetcher.h
+++ b/net/proxy/proxy_script_fetcher.h
@@ -50,8 +50,8 @@ class ProxyScriptFetcher {
// Testing helpers (only available to unit-tests).
// --------------------------------------------------------------------------
private:
- FRIEND_TEST(ProxyScriptFetcherTest, DISABLED_Hang);
- FRIEND_TEST(ProxyScriptFetcherTest, DISABLED_TooLarge);
+ FRIEND_TEST(ProxyScriptFetcherTest, Hang);
+ FRIEND_TEST(ProxyScriptFetcherTest, TooLarge);
// Sets the maximum duration for a fetch to |timeout_ms|. Returns the previous
// bound.
diff --git a/net/proxy/proxy_script_fetcher_unittest.cc b/net/proxy/proxy_script_fetcher_unittest.cc
index 22cb91e..73476ed 100644
--- a/net/proxy/proxy_script_fetcher_unittest.cc
+++ b/net/proxy/proxy_script_fetcher_unittest.cc
@@ -160,7 +160,7 @@ GURL GetTestFileUrl(const std::string& relpath) {
return GURL(base_url.spec() + "/" + relpath);
}
-TEST(ProxyScriptFetcherTest, DISABLED_FileUrl) {
+TEST(ProxyScriptFetcherTest, FileUrl) {
SynchFetcher pac_fetcher;
{ // Fetch a non-existent file.
@@ -177,7 +177,7 @@ TEST(ProxyScriptFetcherTest, DISABLED_FileUrl) {
// Note that all mime types are allowed for PAC file, to be consistent
// with other browsers.
-TEST(ProxyScriptFetcherTest, DISABLED_HttpMimeType) {
+TEST(ProxyScriptFetcherTest, HttpMimeType) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -201,7 +201,7 @@ TEST(ProxyScriptFetcherTest, DISABLED_HttpMimeType) {
}
}
-TEST(ProxyScriptFetcherTest, DISABLED_HttpStatusCode) {
+TEST(ProxyScriptFetcherTest, HttpStatusCode) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -219,7 +219,7 @@ TEST(ProxyScriptFetcherTest, DISABLED_HttpStatusCode) {
}
}
-TEST(ProxyScriptFetcherTest, DISABLED_ContentDisposition) {
+TEST(ProxyScriptFetcherTest, ContentDisposition) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -231,7 +231,7 @@ TEST(ProxyScriptFetcherTest, DISABLED_ContentDisposition) {
EXPECT_EQ("-downloadable.pac-\n", result.bytes);
}
-TEST(ProxyScriptFetcherTest, DISABLED_TooLarge) {
+TEST(ProxyScriptFetcherTest, TooLarge) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;
@@ -264,7 +264,7 @@ TEST(ProxyScriptFetcherTest, DISABLED_TooLarge) {
}
}
-TEST(ProxyScriptFetcherTest, DISABLED_Hang) {
+TEST(ProxyScriptFetcherTest, Hang) {
TestServer server(kDocRoot);
SynchFetcher pac_fetcher;