Merge video_capture tests into service_unittests

services/video_capture/test/video_capture_service_test.cc

Index: services/video_capture/test/video_capture_service_test.cc
diff --git a/services/video_capture/test/service_test.cc b/services/video_capture/test/video_capture_service_test.cc
similarity index 54%
rename from services/video_capture/test/service_test.cc
rename to services/video_capture/test/video_capture_service_test.cc
index 60f18ce6b155755cfc1a9d7703d384f96ce1c188..997cc18d658da571caa67c801d7ab8b5687c6a77 100644
--- a/services/video_capture/test/service_test.cc
+++ b/services/video_capture/test/video_capture_service_test.cc
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "services/video_capture/test/service_test.h"
+#include "services/video_capture/test/video_capture_service_test.h"
 
 namespace video_capture {
 
-ServiceTest::ServiceTest()
-    : service_manager::test::ServiceTest("video_capture_unittests") {}
+VideoCaptureServiceTest::VideoCaptureServiceTest()
+    : ServiceTest("video_capture_unittests") {}
 
-ServiceTest::~ServiceTest() = default;
+VideoCaptureServiceTest::~VideoCaptureServiceTest() = default;
 
-void ServiceTest::SetUp() {
-  service_manager::test::ServiceTest::SetUp();
+void VideoCaptureServiceTest::SetUp() {
+  ServiceTest::SetUp();
   connector()->BindInterface("video_capture", &service_);
   service_->ConnectToFakeDeviceFactory(mojo::MakeRequest(&factory_));
 }