Refactor MediaStreamManager to never output real device id. It now always output sourceId in the fo…

content/browser/renderer_host/media/device_request_message_filter.h

Index: content/browser/renderer_host/media/device_request_message_filter.h
diff --git a/content/browser/renderer_host/media/device_request_message_filter.h b/content/browser/renderer_host/media/device_request_message_filter.h
index 0f0505d877def40f24b9e92c2b82284b13a3659e..6c164ab09ca9d0ca9346365c793f90df35bb45f9 100644
--- a/content/browser/renderer_host/media/device_request_message_filter.h
+++ b/content/browser/renderer_host/media/device_request_message_filter.h
@@ -47,20 +47,11 @@ class CONTENT_EXPORT DeviceRequestMessageFilter : public BrowserMessageFilter,
                                  bool* message_was_ok) OVERRIDE;
   virtual void OnChannelClosing() OVERRIDE;
 
-  // Helper method that checks whether the GUID generated by
-  // DeviceRequestMessageFilter matches the given |raw_device_id|.
-  static bool DoesRawIdMatchGuid(const GURL& security_origin,
-                                 const std::string& device_guid,
-                                 const std::string& raw_device_id);
-
  protected:
   virtual ~DeviceRequestMessageFilter();
 
  private:
   void OnGetSources(int request_id, const GURL& security_origin);
-  void HmacDeviceIds(const GURL& origin,
-                     const StreamDeviceInfoArray& raw_devices,
-                     StreamDeviceInfoArray* devices_with_guids);
 
   // Owned by ProfileIOData which is guaranteed to outlive DRMF.
   ResourceContext* resource_context_;