Merge video_capture tests into service_unittests

services/video_capture/test/video_capture_service_test.h

Index: services/video_capture/test/video_capture_service_test.h
diff --git a/services/video_capture/test/service_test.h b/services/video_capture/test/video_capture_service_test.h
similarity index 65%
rename from services/video_capture/test/service_test.h
rename to services/video_capture/test/video_capture_service_test.h
index 9d5b4b3442812623a9e74c78e80a8f3fe9153751..63ee961879f21ce34c8ea69256d73df2b834ef69 100644
--- a/services/video_capture/test/service_test.h
+++ b/services/video_capture/test/video_capture_service_test.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_SERVICE_TEST_H_
-#define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_SERVICE_TEST_H_
+#ifndef SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_VIDEO_CAPTURE_SERVICE_TEST_H_
+#define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_VIDEO_CAPTURE_SERVICE_TEST_H_
 
 #include "base/test/mock_callback.h"
 #include "services/service_manager/public/cpp/service_test.h"
@@ -13,10 +13,10 @@
 namespace video_capture {
 
 // Basic test fixture that sets up a connection to the fake device factory.
-class ServiceTest : public service_manager::test::ServiceTest {
+class VideoCaptureServiceTest : public service_manager::test::ServiceTest {

[chfremer, 2017/01/30 20:05:00]

I understand that this is for being able to identify the test fixture the output
of test runs. 

I originally had all classes, including these tests, use the VideoCapture*
prefix and then decided to drop it, because it seemed awfully redundant. If we
now need the prefix for disambiguating tests from output of test runs, should we
add the prefix back in not just here, but for all the tests, e.g. the names
FakeDeviceTest and FakeDeviceDescriptorTest may otherwise also be ambiguous.

Alternatively, would it be possible to have the test runner output the
namespaces? This way we could avoid a lot of redundancy in the names.

  public:
-  ServiceTest();
-  ~ServiceTest() override;
+  VideoCaptureServiceTest();
+  ~VideoCaptureServiceTest() override;
 
   void SetUp() override;
 
@@ -29,4 +29,4 @@ class ServiceTest : public service_manager::test::ServiceTest {
 
 }  // namespace video_capture
 
-#endif  // SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_SERVICE_TEST_H_
+#endif  // SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_TEST_VIDEO_CAPTURE_SERVICE_TEST_H_