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

content/public/common/desktop_media_id.h

Index: content/public/common/desktop_media_id.h
diff --git a/content/public/common/desktop_media_id.h b/content/public/common/desktop_media_id.h
deleted file mode 100644
index a863872eb12981c90b47d8d8b878723ca194fd6d..0000000000000000000000000000000000000000
--- a/content/public/common/desktop_media_id.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 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.
-
-#ifndef CONTENT_PUBLIC_COMMON_DESKTOP_MEDIA_ID_H_
-#define CONTENT_PUBLIC_COMMON_DESKTOP_MEDIA_ID_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_util.h"
-#include "content/common/content_export.h"
-
-namespace content {
-
-// Type used to identify desktop media sources. It's converted to string and
-// stored in MediaStreamRequest::requested_video_device_id .
-struct CONTENT_EXPORT DesktopMediaID {
- public:
-  enum Type {
-    TYPE_NONE,
-    TYPE_SCREEN,
-    TYPE_WINDOW,
-  };
-  typedef intptr_t Id;
-
-  static DesktopMediaID Parse(const std::string& str);
-
-  DesktopMediaID()
-      : type(TYPE_NONE),
-        id(0) {
-  }
-  DesktopMediaID(Type type, Id id)
-      : type(type),
-        id(id) {
-  }
-
-  // Operators so that DesktopMediaID can be used with STL containers.
-  bool operator<(const DesktopMediaID& other) const {
-    return type < other.type || (type == other.type && id < other.id);
-  }
-  bool operator==(const DesktopMediaID& other) const {
-    return type == other.type && id == other.id;
-  }
-
-  bool is_null() { return type == TYPE_NONE; }
-
-  std::string ToString();
-
-  Type type;
-  Id id;
-};
-
-}  // namespace content
-
-#endif  // CONTENT_PUBLIC_COMMON_DESKTOP_MEDIA_ID_H_