Extend content::DesktopMediaID to allow Aura windows as capture sources.

content/browser/renderer_host/media/desktop_capture_device_aura.h

Index: content/browser/renderer_host/media/desktop_capture_device_aura.h
diff --git a/content/browser/renderer_host/media/desktop_capture_device_ash.h b/content/browser/renderer_host/media/desktop_capture_device_aura.h
similarity index 72%
rename from content/browser/renderer_host/media/desktop_capture_device_ash.h
rename to content/browser/renderer_host/media/desktop_capture_device_aura.h
index 95969a8e6b7b98cf1fd249b78965c5dd05d4e4b2..faca53b9b6e121a554b8d172c149d6acabd586eb 100644
--- a/content/browser/renderer_host/media/desktop_capture_device_ash.h
+++ b/content/browser/renderer_host/media/desktop_capture_device_aura.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_ASH_H_
-#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_ASH_H_
+#ifndef CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_
+#define CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
-#include "content/public/common/desktop_media_id.h"
+#include "content/public/browser/desktop_media_id.h"
 #include "media/video/capture/video_capture_device.h"
 
 namespace aura {
@@ -20,14 +20,14 @@ namespace content {
 
 class VideoCaptureDeviceImpl;
 
-// An implementation of VideoCaptureDevice that mirrors the desktop on Ash.
-class CONTENT_EXPORT DesktopCaptureDeviceAsh
+// An implementation of VideoCaptureDevice that mirrors an Aura window.
+class CONTENT_EXPORT DesktopCaptureDeviceAura
     : public media::VideoCaptureDevice {
  public:
-  // Creates a VideoCaptureDevice for the Ash desktop.
+  // Creates a VideoCaptureDevice for the Aura desktop.
   static media::VideoCaptureDevice* Create(const DesktopMediaID& source);
 
-  virtual ~DesktopCaptureDeviceAsh();
+  virtual ~DesktopCaptureDeviceAura();
 
   // VideoCaptureDevice implementation.
   virtual void AllocateAndStart(const media::VideoCaptureParams& params,
@@ -35,14 +35,14 @@ class CONTENT_EXPORT DesktopCaptureDeviceAsh
   virtual void StopAndDeAllocate() OVERRIDE;
 
  private:
-  DesktopCaptureDeviceAsh(const DesktopMediaID& source);
+  DesktopCaptureDeviceAura(const DesktopMediaID& source);
 
   const scoped_ptr<class VideoCaptureDeviceImpl> impl_;
 
-  DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAsh);
+  DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAura);
 };
 
 
 }  // namespace content
 
-#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_ASH_H_
+#endif  // CONTENT_BROWSER_RENDERER_HOST_MEDIA_DESKTOP_CAPTURE_DEVICE_AURA_H_