[Mojo Video Capture] Simplify API and some cleanups

services/video_capture/BUILD.gn

 # Copyright 2016 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.
 
 import("//services/service_manager/public/cpp/service.gni")
 import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 
 service("video_capture") {
   sources = [
@@ skipping 55 matching lines @@
 test("video_capture_unittests") {
   sources = [
     "fake_device_descriptor_test.cc",
     "fake_device_descriptor_test.h",
     "fake_device_descriptor_unittest.cc",
     "fake_device_test.cc",
     "fake_device_test.h",
     "fake_device_unittest.cc",
     "mock_device_descriptor_receiver.cc",
     "mock_device_descriptor_receiver.h",
-    "mock_device_video_capture_service_test.cc",
-    "mock_device_video_capture_service_test.h",
-    "mock_device_video_capture_service_unittest.cc",
+    "mock_device_test.cc",
+    "mock_device_test.h",
+    "mock_device_unittest.cc",
     "mock_video_capture_device_impl.cc",
     "mock_video_capture_device_impl.h",
     "mock_video_frame_receiver.cc",
     "mock_video_frame_receiver.h",
     "video_capture_service_test.cc",
     "video_capture_service_test.h",
     "video_capture_service_unittest.cc",
   ]
 
   deps = [
@@ skipping 14 matching lines @@
 
   data_deps = [
     ":unittest_manifest",
   ]
 }
 
 service_manifest("unittest_manifest") {
   name = "video_capture_unittests"
   source = "service_unittest_manifest.json"
 }