[vr] Permit vr_common_unittests to work with use_ozone

If we set up a scoped task environment in run_all_unittests.cc, we both
support ozone (which expects this) and obviate message loop creation by
our tests.

Bug: 770469
Change-Id: Ibdd803c0d209c721e2c27ed4e6a37210a96f1537
Reviewed-on: https://chromium-review.googlesource.com/702042Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#506745}

chrome/browser/vr/service/vr_device_manager_unittest.cc

@@ -9,8 +9,6 @@
 #include "base/macros.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ptr_util.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
 #include "chrome/browser/vr/service/vr_device_manager.h"
 #include "chrome/browser/vr/service/vr_service_impl.h"
 #include "device/vr/test/fake_vr_device.h"
@@ -79,7 +77,6 @@ class VRDeviceManagerTest : public testing::Test {
   }
 
  private:
-  base::MessageLoop message_loop_;
   device::FakeVRDeviceProvider* provider_ = nullptr;
 
   DISALLOW_COPY_AND_ASSIGN(VRDeviceManagerTest);

chrome/browser/vr/test/run_all_unittests.cc

@@ -6,6 +6,7 @@
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
+#include "base/test/scoped_task_environment.h"
 #include "base/test/test_suite.h"
 #include "build/build_config.h"
 #include "mojo/edk/embedder/embedder.h"
@@ -22,6 +23,10 @@ class VrCommonTestSuite : public base::TestSuite {
   void Initialize() override {
     base::TestSuite::Initialize();
 
+    scoped_task_environment_ =
+        base::MakeUnique<base::test::ScopedTaskEnvironment>(
+            base::test::ScopedTaskEnvironment::MainThreadType::UI);
+
     mojo::edk::Init();
 
     ui::RegisterPathProvider();
@@ -42,6 +47,8 @@ class VrCommonTestSuite : public base::TestSuite {
   }
 
  private:
+  std::unique_ptr<base::test::ScopedTaskEnvironment> scoped_task_environment_;
+
   DISALLOW_COPY_AND_ASSIGN(VrCommonTestSuite);
 };
 

chrome/browser/vr/test/ui_scene_manager_test.h

@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
+#include "base/time/time.h"
 #include "chrome/browser/vr/elements/ui_element_name.h"
 #include "chrome/browser/vr/test/mock_browser_interface.h"
 #include "chrome/browser/vr/test/mock_content_input_delegate.h"
@@ -76,7 +76,6 @@ class UiSceneManagerTest : public testing::Test {
 
   void GetBackgroundColor(SkColor* background_color) const;
 
-  base::MessageLoop message_loop_;
   std::unique_ptr<MockBrowserInterface> browser_;
   std::unique_ptr<MockContentInputDelegate> content_input_delegate_;
   std::unique_ptr<UiScene> scene_;

chrome/browser/vr/ui_scene_manager_unittest.cc

@@ -5,7 +5,6 @@
 #include "chrome/browser/vr/ui_scene_manager.h"
 
 #include "base/macros.h"
-#include "base/message_loop/message_loop.h"
 #include "cc/base/math_util.h"
 #include "chrome/browser/vr/color_scheme.h"
 #include "chrome/browser/vr/elements/content_element.h"