Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(27)

Unified Diff: components/cronet/stale_host_resolver_unittest.cc

Issue 2963643002: Fix Cronet tests. (Closed)
Patch Set: Merge, fix formatting Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/cronet/url_request_context_config_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/cronet/stale_host_resolver_unittest.cc
diff --git a/components/cronet/stale_host_resolver_unittest.cc b/components/cronet/stale_host_resolver_unittest.cc
index 817d48bd00f67abc055130404f0603b059656f05..5da114c060b84ca0020a659ecd4ccf692bde5e15 100644
--- a/components/cronet/stale_host_resolver_unittest.cc
+++ b/components/cronet/stale_host_resolver_unittest.cc
@@ -8,8 +8,8 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/test/scoped_task_environment.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread_task_runner_handle.h"
#include "base/values.h"
@@ -82,7 +82,9 @@ class MockHostResolverProc : public net::HostResolverProc {
class StaleHostResolverTest : public testing::Test {
protected:
StaleHostResolverTest()
- : mock_proc_(new MockHostResolverProc()),
+ : scoped_task_environment_(
+ base::test::ScopedTaskEnvironment::MainThreadType::IO),
+ mock_proc_(new MockHostResolverProc()),
resolver_(nullptr),
resolve_pending_(false),
resolve_complete_(false) {}
@@ -257,7 +259,8 @@ class StaleHostResolverTest : public testing::Test {
private:
// Needed for HostResolver to run HostResolverProc callbacks.
- base::MessageLoopForIO message_loop_for_io_;
+ base::test::ScopedTaskEnvironment scoped_task_environment_;
+
scoped_refptr<MockHostResolverProc> mock_proc_;
net::HostResolver* resolver_;
@@ -441,8 +444,7 @@ TEST_F(StaleHostResolverTest, StaleUsability) {
}
}
-// Test is flaky. See https://crbug.com/737326.
-TEST_F(StaleHostResolverTest, DISABLED_CreatedByContext) {
+TEST_F(StaleHostResolverTest, CreatedByContext) {
URLRequestContextConfig config(
// Enable QUIC.
true,
« no previous file with comments | « no previous file | components/cronet/url_request_context_config_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698