TabSpecificContentSettings no longer knows about MediaStreamDeviceController

chrome/browser/content_settings/tab_specific_content_settings.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_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 #define CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/scoped_observer.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/content_settings/content_settings_usages_state.h"
 #include "chrome/browser/content_settings/local_shared_objects_container.h"
-#include "chrome/browser/media/media_stream_devices_controller.h"
 #include "chrome/common/custom_handlers/protocol_handler.h"
 #include "components/content_settings/core/browser/content_settings_observer.h"
 #include "components/content_settings/core/common/content_settings.h"
 #include "components/content_settings/core/common/content_settings_types.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
-#include "content/public/common/media_stream_request.h"
 #include "net/cookies/canonical_cookie.h"
 
 class HostContentSettingsMap;
 class Profile;
 
 namespace content {
 class RenderViewHost;
 }
 
 namespace net {
@@ skipping 309 matching lines @@
                              const base::string16& display_name,
                              bool blocked_by_policy);
   void OnGeolocationPermissionSet(const GURL& requesting_frame,
                                   bool allowed);
 #if defined(OS_ANDROID)
   void OnProtectedMediaIdentifierPermissionSet(const GURL& requesting_frame,
                                                bool allowed);
 #endif
 
   // This method is called to update the status about the microphone and
-  // camera stream access. |request_permissions| contains a list of requested
-  // media stream types and the permission for each type.
+  // camera stream access.
   void OnMediaStreamPermissionSet(
       const GURL& request_origin,
-      const MediaStreamDevicesController::MediaStreamTypeSettingsMap&
-          request_permissions);
+      MicrophoneCameraState new_microphone_camera_state,
+      const std::string& media_stream_selected_audio_device,
+      const std::string& media_stream_selected_video_device,
+      const std::string& media_stream_requested_audio_device,
+      const std::string& media_stream_requested_video_device);
 
   // There methods are called to update the status about MIDI access.
   void OnMidiSysExAccessed(const GURL& reqesting_origin);
   void OnMidiSysExAccessBlocked(const GURL& requesting_origin);
 
   // Adds the given |SiteDataObserver|. The |observer| is notified when a
   // locale shared object, like for example a cookie, is accessed.
   void AddSiteDataObserver(SiteDataObserver* observer);
 
   // Removes the given |SiteDataObserver|.
@@ skipping 72 matching lines @@
   std::string media_stream_requested_audio_device_;
   std::string media_stream_requested_video_device_;
 
   // Observer to watch for content settings changed.
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(TabSpecificContentSettings);
 };
 
 #endif  // CHROME_BROWSER_CONTENT_SETTINGS_TAB_SPECIFIC_CONTENT_SETTINGS_H_