diff options
-rw-r--r-- | base/message_loop.cc | 9 | ||||
-rw-r--r-- | net/proxy/proxy_script_fetcher.h | 4 | ||||
-rw-r--r-- | net/proxy/proxy_script_fetcher_unittest.cc | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/base/message_loop.cc b/base/message_loop.cc index 12ad3fa..76f75d5 100644 --- a/base/message_loop.cc +++ b/base/message_loop.cc @@ -9,6 +9,7 @@ #include "base/compiler_specific.h" #include "base/lazy_instance.h" #include "base/logging.h" +#include "base/memory_debug.h" #include "base/message_pump_default.h" #include "base/string_util.h" #include "base/thread_local.h" @@ -107,6 +108,14 @@ MessageLoop::MessageLoop(Type type) pump_ = new base::MessagePumpDefault(); } #endif // OS_POSIX + + // We override the PURIFY build to disregard any UMRs in delayed_work_queue_. + // This avoids an error in pop(), which pushes the |comp| field onto the + // stack. The |comp| field is uninitialized, since it is std::less, which is + // an empty struct -- VS reserves 1 byte for this struct, which will never + // be initialized. See http://crbug.com/5555. + base::MemoryDebug::MarkAsInitialized(&delayed_work_queue_, + sizeof(delayed_work_queue_)); } MessageLoop::~MessageLoop() { 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; |