bluetooth: Add device list retrieval for chrome://bluetooth-internals

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
@@ skipping 151 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/child_process_host.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_shell_connection.h"
 #include "content/public/common/sandbox_type.h"
 #include "content/public/common/service_names.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/common/web_preferences.h"
+#include "device/bluetooth/adapter.h"
+#include "device/bluetooth/public/interfaces/adapter.mojom.h"
 #include "device/usb/public/interfaces/chooser_service.mojom.h"
 #include "device/usb/public/interfaces/device_manager.mojom.h"
 #include "gin/v8_initializer.h"
 #include "net/base/mime_util.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
 #include "services/shell/public/cpp/interface_provider.h"
@@ skipping 1069 matching lines @@
 #else
   return true;
 #endif
 }
 
 bool ChromeContentBrowserClient::MayReuseHost(
     content::RenderProcessHost* process_host) {
   // If there is currently a prerender in progress for the host provided,
   // it may not be shared. We require prerenders to be by themselves in a
   // separate process so that we can monitor their resource usage.
+  Profile* profile =

[scheib, 2016/09/30 04:25:37]

Is this a merge glitch? git map-branches will show the branch your feature work
is tracking -- did you merge from origin/master into the feature branch without
first merging into the branch the feature is tracking?

+      Profile::FromBrowserContext(process_host->GetBrowserContext());
   prerender::PrerenderManager* prerender_manager =
       prerender::PrerenderManagerFactory::GetForBrowserContext(
           process_host->GetBrowserContext());
   if (prerender_manager &&
       !prerender_manager->MayReuseProcessHost(process_host)) {
     return false;
   }
 
   return true;
 }
@@ skipping 1668 matching lines @@
       !render_frame_host->GetSiteInstance()->GetSiteURL().SchemeIs(
           extensions::kExtensionScheme)
 #endif
           ) {
     registry->AddInterface(
         base::Bind(&CreateUsbDeviceManager, render_frame_host));
     registry->AddInterface(
         base::Bind(&CreateWebUsbChooserService, render_frame_host));
   }
 
+  registry->AddInterface<bluetooth::mojom::Adapter>(
+      base::Bind(&bluetooth::Adapter::Create));
+
   if (!render_frame_host->GetParent()) {
     // Register mojo CredentialManager interface only for main frame.
     registry->AddInterface(
         base::Bind(&ChromePasswordManagerClient::BindCredentialManager,
                    render_frame_host));
     // Register mojo ContentTranslateDriver interface only for main frame.
     registry->AddInterface(base::Bind(
         &ChromeTranslateClient::BindContentTranslateDriver, render_frame_host));
   }
 
@@ skipping 16 matching lines @@
     registry->AddInterface(
         web_contents->GetJavaInterfaces()
             ->CreateInterfaceFactory<blink::mojom::ShareService>());
   }
 #endif
 
 #if defined(ENABLE_MEDIA_ROUTER)
   registry->AddInterface(
       base::Bind(&CastRemotingConnector::CreateRemoterFactory,
                  render_frame_host));
+  ChromeInterfaceRegistrarAndroid::ExposeInterfacesToFrame(registry,

[scheib, 2016/09/30 04:25:37]

Merge glitch?

+                                                           render_frame_host);
 #endif
 }
 
 void ChromeContentBrowserClient::ExposeInterfacesToGpuProcess(
     shell::InterfaceRegistry* registry,
     content::GpuProcessHost* render_process_host) {
   registry->AddInterface(
       base::Bind(&metrics::CallStackProfileCollector::Create,
                  metrics::CallStackProfileParams::GPU_PROCESS));
 }
@@ skipping 245 matching lines @@
   if (channel <= kMaxDisableEncryptionChannel) {
     static const char* const kWebRtcDevSwitchNames[] = {
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)