Revert 179093

chrome/browser/media/media_stream_devices_controller.h

 // Copyright (c) 2012 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 CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_
 
 #include <string>
 
 #include "content/public/browser/web_contents_delegate.h"
 
 class PrefServiceSyncable;
 class Profile;
-class TabSpecificContentSettings;
 
 class MediaStreamDevicesController {
  public:
   MediaStreamDevicesController(Profile* profile,
-                               TabSpecificContentSettings* content_settings,
                                const content::MediaStreamRequest& request,
                                const content::MediaResponseCallback& callback);
 
   virtual ~MediaStreamDevicesController();
 
   // Registers the prefs backing the audio and video policies.
   static void RegisterUserPrefs(PrefServiceSyncable* prefs);
 
   // Public method to be called before creating the MediaStreamInfoBarDelegate.
   // This function will check the content settings exceptions and take the
@@ skipping 36 matching lines @@
   // chrome://URLs, otherwise returns false.
   bool ShouldAlwaysAllowOrigin() const;
 
   // Sets the permission of the origin of the request. This is triggered when
   // the users deny the request or allow the request for https sites.
   void SetPermission(bool allowed) const;
 
   // The owner of this class needs to make sure it does not outlive the profile.
   Profile* profile_;
 
-  // Weak pointer to the tab specific content settings of the tab for which the
-  // MediaStreamDevicesController was created. The tab specific content
-  // settings are associated with a the web contents of the tab. The
-  // MediaStreamDeviceController must not outlive the web contents for which it
-  // was created.
-  TabSpecificContentSettings* content_settings_;
-
   // The original request for access to devices.
   const content::MediaStreamRequest request_;
 
   // The callback that needs to be Run to notify WebRTC of whether access to
   // audio/video devices was granted or not.
   content::MediaResponseCallback callback_;
 
   bool has_audio_;
   bool has_video_;
   DISALLOW_COPY_AND_ASSIGN(MediaStreamDevicesController);
 };
 
 #endif  // CHROME_BROWSER_MEDIA_MEDIA_STREAM_DEVICES_CONTROLLER_H_