Remove chrome/browser/ui/media_utils.{cc|h}

chrome/browser/ui/browser.cc

 // Copyright 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/browser.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 105 matching lines @@
 #include "chrome/browser/ui/extensions/hosted_app_browser_controller.h"
 #include "chrome/browser/ui/fast_unload_controller.h"
 #include "chrome/browser/ui/find_bar/find_bar.h"
 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
 #include "chrome/browser/ui/find_bar/find_tab_helper.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/global_error/global_error_service.h"
 #include "chrome/browser/ui/global_error/global_error_service_factory.h"
 #include "chrome/browser/ui/javascript_dialogs/javascript_dialog_tab_helper.h"
 #include "chrome/browser/ui/location_bar/location_bar.h"
-#include "chrome/browser/ui/media_utils.h"
 #include "chrome/browser/ui/search/search_delegate.h"
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/singleton_tabs.h"
 #include "chrome/browser/ui/status_bubble.h"
 #include "chrome/browser/ui/sync/browser_synced_window_delegate.h"
 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
 #include "chrome/browser/ui/tab_dialogs.h"
 #include "chrome/browser/ui/tab_helpers.h"
@@ skipping 118 matching lines @@
 BrowserWindow* CreateBrowserWindow(Browser* browser) {
   return BrowserWindow::CreateBrowserWindow(browser);
 }
 
 // Is the fast tab unload experiment enabled?
 bool IsFastTabUnloadEnabled() {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableFastUnload);
 }
 
+#if BUILDFLAG(ENABLE_EXTENSIONS)

[Peter Kasting, 2017/01/24 00:26:41]

Nit: If you do this instead:

const extensions::Extension* GetExtensionForOrigin(
    Profile* profile,
    const GURL& security_origin) {
#if BUILDFLAG(ENABLE_EXTENSIONS)
  ...
#else
  return nullptr;
#endif;
}

...then callers can just drop all their #ifdefs.

[Guido Urdaneta, 2017/01/24 10:45:39]

Done.

+const extensions::Extension* GetExtensionForOrigin(
+    Profile* profile,
+    const GURL& security_origin) {
+  if (!security_origin.SchemeIs(extensions::kExtensionScheme))
+    return NULL;

[Peter Kasting, 2017/01/24 00:26:42]

Nit: nullptr

[Guido Urdaneta, 2017/01/24 10:45:39]

Done.

+
+  const extensions::Extension* extension =
+      extensions::ExtensionRegistry::Get(profile)->enabled_extensions().GetByID(
+          security_origin.host());
+  DCHECK(extension);
+  return extension;
+}
+#endif
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // Browser, CreateParams:
 
 Browser::CreateParams::CreateParams(Profile* profile)
     : type(TYPE_TABBED),
       profile(profile),
       trusted_source(false),
       initial_show_state(ui::SHOW_STATE_DEFAULT),
@@ skipping 1534 matching lines @@
 }
 
 void Browser::LostMouseLock() {
   exclusive_access_manager_->mouse_lock_controller()->LostMouseLock();
 }
 
 void Browser::RequestMediaAccessPermission(
     content::WebContents* web_contents,
     const content::MediaStreamRequest& request,
     const content::MediaResponseCallback& callback) {
-  ::RequestMediaAccessPermission(web_contents, profile_, request, callback);
+  const extensions::Extension* extension = NULL;

[Peter Kasting, 2017/01/24 00:26:41]

Nit: Can be combined with the next line if you follow my suggestion above about
#ifs.

[Guido Urdaneta, 2017/01/24 10:45:39]

Done.

+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  extension = GetExtensionForOrigin(profile_, request.security_origin);
+#endif
+  MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
+      web_contents, request, callback, extension);
 }
 
 bool Browser::CheckMediaAccessPermission(content::WebContents* web_contents,
                                          const GURL& security_origin,
                                          content::MediaStreamType type) {
-  return ::CheckMediaAccessPermission(web_contents, security_origin, type);
+#if BUILDFLAG(ENABLE_EXTENSIONS)
+  Profile* profile =
+      Profile::FromBrowserContext(web_contents->GetBrowserContext());
+  const extensions::Extension* extension =
+      GetExtensionForOrigin(profile, security_origin);
+  if (extension) {
+    return MediaCaptureDevicesDispatcher::GetInstance()
+        ->CheckMediaAccessPermission(web_contents, security_origin, type,
+                                     extension);
+  }
+  return MediaCaptureDevicesDispatcher::GetInstance()
+      ->CheckMediaAccessPermission(web_contents, security_origin, type);

[Peter Kasting, 2017/01/24 00:26:41]

Nit: Since the four-arg version of CheckMediaAccessPermission() just calls the
five-arg version with nullptr, you can just do:

  return MediaCaptureDevicesDispatcher::GetInstance()
      ->CheckMediaAccessPermission(web_contents, security_origin, type,
                                   extension);

[Guido Urdaneta, 2017/01/24 10:45:39]

Done.

+#else
+  return MediaCaptureDevicesDispatcher::GetInstance()
+      ->CheckMediaAccessPermission(web_contents, security_origin, type);
+#endif
 }
 
 std::string Browser::GetDefaultMediaDeviceId(content::WebContents* web_contents,
                                              content::MediaStreamType type) {
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   return MediaCaptureDevicesDispatcher::GetInstance()
       ->GetDefaultDeviceIdForProfile(profile, type);
 }
 
@@ skipping 753 matching lines @@
     // new window later, thus we need to navigate the window now.
     if (contents) {
       contents->web_contents()->GetController().LoadURL(
           target_url, content::Referrer(), ui::PAGE_TRANSITION_LINK,
           std::string());  // No extra headers.
     }
   }
 
   return contents != NULL;
 }