Move chrome://media-internals to content. This allows us to hide implementation details from the pu…

chrome/browser/ui/webui/options/media_devices_selection_handler.cc

 // 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.
 
 #include "chrome/browser/ui/webui/options/media_devices_selection_handler.h"
 
 #include "base/bind.h"
-#include "chrome/browser/media/media_internals.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 
 namespace {
 
 const char kAudio[] = "mic";
 const char kVideo[] = "camera";
 
 }  // namespace
 
 namespace options {
 
 MediaDevicesSelectionHandler::MediaDevicesSelectionHandler() {}
 
 MediaDevicesSelectionHandler::~MediaDevicesSelectionHandler() {
-  // Register to the device observer list to get up-to-date device lists.
-  MediaCaptureDevicesDispatcher* dispatcher =
-      MediaInternals::GetInstance()->GetMediaCaptureDevicesDispatcher();
-  dispatcher->RemoveObserver(this);
+  MediaCaptureDevicesDispatcher::GetInstance()->RemoveObserver(this);
 }
 
 void MediaDevicesSelectionHandler::GetLocalizedValues(DictionaryValue* values) {
   DCHECK(values);
 
   static OptionsStringResource resources[] = {
     { "mediaSelectMicLabel", IDS_MEDIA_SELECTED_MIC_LABEL },
     { "mediaSelectCameraLabel", IDS_MEDIA_SELECTED_CAMERA_LABEL },
   };
 
   RegisterStrings(values, resources, arraysize(resources));
 }
 
 void MediaDevicesSelectionHandler::InitializePage() {
   // Register to the device observer list to get up-to-date device lists.
-  MediaCaptureDevicesDispatcher* dispatcher =
-      MediaInternals::GetInstance()->GetMediaCaptureDevicesDispatcher();
-  dispatcher->AddObserver(this);
+  MediaCaptureDevicesDispatcher::GetInstance()->AddObserver(this);
 
   // Update the device selection menus.
   UpdateDevicesMenuForType(AUDIO);
   UpdateDevicesMenuForType(VIDEO);
 }
 
 void MediaDevicesSelectionHandler::RegisterMessages() {
   web_ui()->RegisterMessageCallback("setDefaultCaptureDevice",
       base::Bind(&MediaDevicesSelectionHandler::SetDefaultCaptureDevice,
                  base::Unretained(this)));
@@ skipping 68 matching lines @@
 
   StringValue default_value(default_id);
   StringValue type_value(device_type);
   web_ui()->CallJavascriptFunction("ContentSettings.updateDevicesMenu",
                                    type_value,
                                    device_list,
                                    default_value);
 }
 
 void MediaDevicesSelectionHandler::UpdateDevicesMenuForType(DeviceType type) {
-  scoped_refptr<MediaCaptureDevicesDispatcher> dispatcher =
-      MediaInternals::GetInstance()->GetMediaCaptureDevicesDispatcher();
   content::MediaStreamDevices devices;
   switch (type) {
     case AUDIO:
-      devices = dispatcher->GetAudioCaptureDevices();
+      devices = MediaCaptureDevicesDispatcher::GetInstance()->
+          GetAudioCaptureDevices();
       break;
     case VIDEO:
-      devices = dispatcher->GetVideoCaptureDevices();
+      devices = MediaCaptureDevicesDispatcher::GetInstance()->
+          GetVideoCaptureDevices();
       break;
   }
 
   UpdateDevicesMenu(type, devices);
 }
 
 }  // namespace options