Move context_cache_controller_unittest.cc beside the class it tests.

R=enne@chromium.org

Bug: 722935
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
Change-Id: I3d6652af46f1d1008e570b0ec1336b69f17d9878
Reviewed-on: https://chromium-review.googlesource.com/677062Reviewed-by: enne <enne@chromium.org>
Commit-Queue: danakj <danakj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#503569}

cc/BUILD.gn

@@ -610,7 +610,6 @@ cc_test("cc_unittests") {
     "layers/video_frame_provider_client_impl_unittest.cc",
     "layers/video_layer_impl_unittest.cc",
     "layers/viewport_unittest.cc",
-    "output/context_cache_controller_unittest.cc",
     "paint/discardable_image_map_unittest.cc",
     "paint/display_item_list_unittest.cc",
     "paint/paint_image_unittest.cc",

components/viz/common/BUILD.gn

@@ -166,6 +166,7 @@ viz_source_set("unit_tests") {
     "frame_sinks/begin_frame_args_unittest.cc",
     "frame_sinks/delay_based_time_source_unittest.cc",
     "gl_helper_unittest.cc",
+    "gpu/context_cache_controller_unittest.cc",
     "quads/draw_quad_unittest.cc",
     "quads/render_pass_unittest.cc",
     "resources/buffer_to_texture_target_map_unittest.cc",
@@ -184,6 +185,7 @@ viz_source_set("unit_tests") {
     "//gpu/ipc:gl_in_process_context",
     "//gpu/ipc/common:surface_handle_type",
     "//media",
+    "//testing/gmock",
     "//testing/gtest",
   ]
 }

components/viz/common/DEPS

@@ -11,6 +11,7 @@ specific_include_rules = {
     "+third_party/skia",
   ],
   ".*_unittest\.cc": [
+    "+cc/test",
     "+components/viz/test",
     "+gpu/ipc/gl_in_process_context.h",
     "+media/base",

cc/output/context_cache_controller_unittest.cc → components/viz/common/gpu/context_cache_controller_unittest.cc

@@ -12,12 +12,13 @@
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace cc {
-namespace {
 using ::testing::Mock;
 using ::testing::StrictMock;
 
-class MockContextSupport : public TestContextSupport {
+namespace viz {
+namespace {
+
+class MockContextSupport : public cc::TestContextSupport {
  public:
   MockContextSupport() {}
   MOCK_METHOD1(SetAggressivelyFreeResources,
@@ -26,11 +27,11 @@ class MockContextSupport : public TestContextSupport {
 
 TEST(ContextCacheControllerTest, ScopedVisibilityBasic) {
   StrictMock<MockContextSupport> context_support;
-  auto task_runner = make_scoped_refptr(new base::TestMockTimeTaskRunner);
-  viz::ContextCacheController cache_controller(&context_support, task_runner);
+  auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  ContextCacheController cache_controller(&context_support, task_runner);
 
   EXPECT_CALL(context_support, SetAggressivelyFreeResources(false));
-  std::unique_ptr<viz::ContextCacheController::ScopedVisibility> visibility =
+  std::unique_ptr<ContextCacheController::ScopedVisibility> visibility =
       cache_controller.ClientBecameVisible();
   Mock::VerifyAndClearExpectations(&context_support);
 
@@ -40,8 +41,8 @@ TEST(ContextCacheControllerTest, ScopedVisibilityBasic) {
 
 TEST(ContextCacheControllerTest, ScopedVisibilityMulti) {
   StrictMock<MockContextSupport> context_support;
-  auto task_runner = make_scoped_refptr(new base::TestMockTimeTaskRunner);
-  viz::ContextCacheController cache_controller(&context_support, task_runner);
+  auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  ContextCacheController cache_controller(&context_support, task_runner);
 
   EXPECT_CALL(context_support, SetAggressivelyFreeResources(false));
   auto visibility_1 = cache_controller.ClientBecameVisible();
@@ -55,8 +56,8 @@ TEST(ContextCacheControllerTest, ScopedVisibilityMulti) {
 
 TEST(ContextCacheControllerTest, ScopedBusyWhileVisible) {
   StrictMock<MockContextSupport> context_support;
-  auto task_runner = make_scoped_refptr(new base::TestMockTimeTaskRunner);
-  viz::ContextCacheController cache_controller(&context_support, task_runner);
+  auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  ContextCacheController cache_controller(&context_support, task_runner);
 
   EXPECT_CALL(context_support, SetAggressivelyFreeResources(false));
   auto visibility = cache_controller.ClientBecameVisible();
@@ -77,8 +78,8 @@ TEST(ContextCacheControllerTest, ScopedBusyWhileVisible) {
 
 TEST(ContextCacheControllerTest, ScopedBusyWhileNotVisible) {
   StrictMock<MockContextSupport> context_support;
-  auto task_runner = make_scoped_refptr(new base::TestMockTimeTaskRunner);
-  viz::ContextCacheController cache_controller(&context_support, task_runner);
+  auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  ContextCacheController cache_controller(&context_support, task_runner);
 
   auto busy = cache_controller.ClientBecameBusy();
 
@@ -89,8 +90,8 @@ TEST(ContextCacheControllerTest, ScopedBusyWhileNotVisible) {
 
 TEST(ContextCacheControllerTest, ScopedBusyMulitpleWhileVisible) {
   StrictMock<MockContextSupport> context_support;
-  auto task_runner = make_scoped_refptr(new base::TestMockTimeTaskRunner);
-  viz::ContextCacheController cache_controller(&context_support, task_runner);
+  auto task_runner = base::MakeRefCounted<base::TestMockTimeTaskRunner>();
+  ContextCacheController cache_controller(&context_support, task_runner);
 
   EXPECT_CALL(context_support, SetAggressivelyFreeResources(false));
   auto visible = cache_controller.ClientBecameVisible();
@@ -112,4 +113,4 @@ TEST(ContextCacheControllerTest, ScopedBusyMulitpleWhileVisible) {
 }
 
 }  // namespace
-}  // namespace cc
+}  // namespace viz