Use ScopedTaskEnvironment instead of MessageLoop in tests that use v8.

content/test/blink_test_environment.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/blink_test_environment.h"
 
 #include <string>
 
 #include "base/command_line.h"
-#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/string_tokenizer.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_discardable_memory_allocator.h"
 #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
 #include "build/build_config.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/user_agent.h"
 #include "content/public/test/test_content_client_initializer.h"
 #include "content/test/test_blink_web_unit_test_support.h"
 #include "third_party/WebKit/public/platform/WebCache.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "url/url_util.h"
 
 #if defined(OS_WIN)
 #include "ui/display/win/dpi.h"
 #endif
 
 #if defined(OS_MACOSX)
 #include "base/test/mock_chrome_application_mac.h"
 #endif
 
 namespace content {
 
 namespace {
 
 class TestEnvironment {
  public:
-#if defined(OS_ANDROID)
-  // Android UI message loop goes through Java, so don't use it in tests.
-  typedef base::MessageLoop MessageLoopType;
-#else
-  typedef base::MessageLoopForUI MessageLoopType;
+  TestEnvironment()
+#if !defined(OS_ANDROID)
+      // On Android, Java pumps UI messages.
+      : scoped_task_environment_(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI)
 #endif
-
-  TestEnvironment() {
-    main_message_loop_.reset(new MessageLoopType);
-
-    // TestBlinkWebUnitTestSupport must be instantiated after MessageLoopType.
-    blink_test_support_.reset(new TestBlinkWebUnitTestSupport);
-    content_initializer_.reset(new content::TestContentClientInitializer());
-
+  {
     base::DiscardableMemoryAllocator::SetInstance(
         &discardable_memory_allocator_);
   }
 
   ~TestEnvironment() {
   }
 
-  TestBlinkWebUnitTestSupport* blink_platform_impl() const {
-    return blink_test_support_.get();
-  }
+ private:
+  base::test::ScopedTaskEnvironment scoped_task_environment_;
 
- private:
-  std::unique_ptr<MessageLoopType> main_message_loop_;
-  std::unique_ptr<TestBlinkWebUnitTestSupport> blink_test_support_;
-  std::unique_ptr<TestContentClientInitializer> content_initializer_;
+  // Must be instantiated after ScopedTaskEnvironment.
+  TestBlinkWebUnitTestSupport blink_test_support_;
+
+  TestContentClientInitializer content_initializer_;
   base::TestDiscardableMemoryAllocator discardable_memory_allocator_;
 };
 
 TestEnvironment* test_environment;
 
 }  // namespace
 
 void SetUpBlinkTestEnvironment() {
   blink::WebRuntimeFeatures::EnableExperimentalFeatures(true);
   blink::WebRuntimeFeatures::EnableTestOnlyFeatures(true);
@@ skipping 18 matching lines @@
   // http://code.google.com/p/chromium/issues/detail?id=9500
   base::RunLoop().RunUntilIdle();
 
   if (RunningOnValgrind())
     blink::WebCache::Clear();
   delete test_environment;
   test_environment = NULL;
 }
 
 }  // namespace content