MediaStream API: Patch #1 of implementing navigator.getMediaDevices

Source/modules/mediastream/MediaDeviceInfo.h

Index: Source/modules/mediastream/MediaDeviceInfo.h
diff --git a/Source/modules/mediastream/SourceInfo.h b/Source/modules/mediastream/MediaDeviceInfo.h
similarity index 72%
copy from Source/modules/mediastream/SourceInfo.h
copy to Source/modules/mediastream/MediaDeviceInfo.h
index 57349887efa01bd6e935d96241316944bc924b1c..36546208886c6071e8369def3b46bc0ab96a6240 100644
--- a/Source/modules/mediastream/SourceInfo.h
+++ b/Source/modules/mediastream/MediaDeviceInfo.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -23,34 +23,33 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef SourceInfo_h
-#define SourceInfo_h
+#ifndef MediaDeviceInfo_h
+#define MediaDeviceInfo_h
 
-#include "bindings/v8/ScriptWrappable.h"
-#include "public/platform/WebSourceInfo.h"
+#include "public/platform/WebMediaDeviceInfo.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
-class SourceInfo : public RefCounted<SourceInfo>, public ScriptWrappable {
+class MediaDeviceInfo : public RefCounted<MediaDeviceInfo> {
 public:
-    static PassRefPtr<SourceInfo> create(const blink::WebSourceInfo&);
+    static PassRefPtr<MediaDeviceInfo> create(const blink::WebMediaDeviceInfo&);
 
-    String id() const;
+    String deviceId() const;
     String kind() const;
     String label() const;
-    String facing() const;
+    String groupId() const;
 
 private:
-    explicit SourceInfo(const blink::WebSourceInfo&);
+    explicit MediaDeviceInfo(const blink::WebMediaDeviceInfo&);
 
-    blink::WebSourceInfo m_webSourceInfo;
+    blink::WebMediaDeviceInfo m_webMediaDeviceInfo;
 };
 
-typedef Vector<RefPtr<SourceInfo> > SourceInfoVector;
+typedef Vector<RefPtr<MediaDeviceInfo> > MediaDeviceInfoVector;
 
 } // namespace WebCore
 
-#endif // SourceInfo_h
+#endif // MediaDeviceInfo_h