Video Capture Mojo (1.4a.b): Rename interface VideoCaptureDevice to VideoCaptureDeviceProxy

services/video_capture/video_capture_device_factory_impl.h

Index: services/video_capture/video_capture_device_factory_impl.h
diff --git a/services/video_capture/video_capture_device_factory_impl.h b/services/video_capture/video_capture_device_factory_impl.h
index 2e3bfbe1619ff5ed117b5e9e9be27ad6c80465c5..b07f3169b9e29ba2ab39ea81a15bec2861f84e90 100644
--- a/services/video_capture/video_capture_device_factory_impl.h
+++ b/services/video_capture/video_capture_device_factory_impl.h
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "services/video_capture/public/interfaces/video_capture_device_factory.mojom.h"
-#include "services/video_capture/video_capture_device_impl.h"
+#include "services/video_capture/video_capture_device_proxy_impl.h"
 
 namespace video_capture {
 
@@ -18,7 +18,7 @@ class VideoCaptureDeviceFactoryImpl : public mojom::VideoCaptureDeviceFactory {
   ~VideoCaptureDeviceFactoryImpl() override;
 
   void AddDevice(mojom::VideoCaptureDeviceDescriptorPtr descriptor,
-                 std::unique_ptr<VideoCaptureDeviceImpl> device);
+                 std::unique_ptr<VideoCaptureDeviceProxyImpl> device);
 
   // mojom::VideoCaptureDeviceFactory:
   void EnumerateDeviceDescriptors(
@@ -26,9 +26,10 @@ class VideoCaptureDeviceFactoryImpl : public mojom::VideoCaptureDeviceFactory {
   void GetSupportedFormats(
       mojom::VideoCaptureDeviceDescriptorPtr device_descriptor,
       const GetSupportedFormatsCallback& callback) override;
-  void CreateDevice(mojom::VideoCaptureDeviceDescriptorPtr device_descriptor,
-                    mojom::VideoCaptureDeviceRequest device_request,
-                    const CreateDeviceCallback& callback) override;
+  void CreateDeviceProxy(
+      mojom::VideoCaptureDeviceDescriptorPtr device_descriptor,
+      mojom::VideoCaptureDeviceProxyRequest proxy_request,
+      const CreateDeviceProxyCallback& callback) override;
 
  private:
   // We use a std::vector of structs with the |descriptor| field as a unique
@@ -40,7 +41,7 @@ class VideoCaptureDeviceFactoryImpl : public mojom::VideoCaptureDeviceFactory {
   class DeviceEntry {
    public:
     DeviceEntry(mojom::VideoCaptureDeviceDescriptorPtr descriptor,
-                std::unique_ptr<VideoCaptureDeviceImpl> bindable_target);
+                std::unique_ptr<VideoCaptureDeviceProxyImpl> bindable_target);
     ~DeviceEntry();
     DeviceEntry(DeviceEntry&& other);
     DeviceEntry& operator=(DeviceEntry&& other);
@@ -49,7 +50,7 @@ class VideoCaptureDeviceFactoryImpl : public mojom::VideoCaptureDeviceFactory {
 
    private:
     mojom::VideoCaptureDeviceDescriptorPtr descriptor_;
-    std::unique_ptr<VideoCaptureDeviceImpl> device_;
+    std::unique_ptr<VideoCaptureDeviceProxyImpl> device_proxy_;
 
     DISALLOW_COPY_AND_ASSIGN(DeviceEntry);
   };