[Chromecast] Reference internal services manifest.

chromecast/browser/cast_content_browser_client.cc

 // Copyright 2014 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 "chromecast/browser/cast_content_browser_client.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 30 matching lines @@
 #include "chromecast/public/media/media_pipeline_backend.h"
 #include "components/crash/content/app/breakpad_linux.h"
 #include "components/crash/content/browser/crash_handler_host_linux.h"
 #include "components/network_hints/browser/network_hints_message_filter.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/certificate_request_result_type.h"
 #include "content/public/browser/client_certificate_delegate.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/resource_dispatcher_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/connection_filter.h"
 #include "content/public/common/content_descriptors.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/common/web_preferences.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/display/display.h"
 #include "ui/display/screen.h"
 #include "ui/gl/gl_switches.h"
 
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 #include "chromecast/media/service/cast_mojo_media_client.h"
 #include "media/mojo/services/media_service.h"  // nogncheck
 #endif  // ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS
 
 #if defined(OS_ANDROID)
 #include "components/crash/content/browser/crash_dump_manager_android.h"
 #else
 #include "chromecast/media/cdm/cast_cdm_factory.h"
 #endif  // defined(OS_ANDROID)
 
 namespace chromecast {
 namespace shell {
 
 namespace {
+
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 static std::unique_ptr<service_manager::Service> CreateMediaService(
     CastContentBrowserClient* browser_client) {
   std::unique_ptr<media::CastMojoMediaClient> mojo_media_client(
       new media::CastMojoMediaClient(
           base::Bind(&CastContentBrowserClient::CreateMediaPipelineBackend,
                      base::Unretained(browser_client)),
           base::Bind(&CastContentBrowserClient::CreateCdmFactory,
                      base::Unretained(browser_client)),
           browser_client->GetVideoResolutionPolicy(),
           browser_client->media_resource_tracker()));
   return std::unique_ptr<service_manager::Service>(
       new ::media::MediaService(std::move(mojo_media_client)));
 }
 #endif  // defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
 
+// This filter will be added to the ServiceManagerConnection for the browser
+// process, registering these interfaces in "service:content_browser" so any
+// external service can use them. This allows another service to connect to an
+// interface "mojom::Foo" registered here by calling:
+//
+//     mojom::FooPtr remote_foo;
+//     connector()->GetInterface("service:content_browser", &remote_foo");
+//
+// Note: Service manifests will also need to be updated. For the example above,
+// chromecast/browser/cast_content_browser_manifest_overlay.json will need to
+// "provide" the interface...
+//
+//   provides: {
+//     "foo_interfaces": [ "mojom::Foo" ]
+//   }
+//
+// ...and the service manifest for the remote service will need to "require" it
+// from "content_browser":
+//
+//   requires: {
+//     "content_browser": [ "foo_interfaces" ]
+//   }
+//
+// We will not filter on |remote_identity| here; instead, connection
+// constraints will be enforced only by the manifests.
+class ContentBrowserConnectionFilter : public content::ConnectionFilter {

[alokp, 2016/12/14 05:46:16]

Are we using connection filter anywhere? If not I would suggest making these
changes only when we need them.

[slan, 2016/12/19 17:58:18]

Removed.

+ public:
+  ContentBrowserConnectionFilter() {}
+  ~ContentBrowserConnectionFilter() override {}
+
+  // content::ConnectionFilter implementation:
+  bool OnConnect(const service_manager::Identity& remote_identity,
+                 service_manager::InterfaceRegistry* registry,
+                 service_manager::Connector* connector) {
+    DCHECK(registry);
+    return true;
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ContentBrowserConnectionFilter);
+};
+
 }  // namespace
 
 CastContentBrowserClient::CastContentBrowserClient()
     : cast_browser_main_parts_(nullptr),
       url_request_context_factory_(new URLRequestContextFactory()) {}
 
 CastContentBrowserClient::~CastContentBrowserClient() {
   content::BrowserThread::DeleteSoon(
       content::BrowserThread::IO,
       FROM_HERE,
@@ skipping 310 matching lines @@
 
 void CastContentBrowserClient::ExposeInterfacesToRenderer(
     service_manager::InterfaceRegistry* registry,
     content::RenderProcessHost* render_process_host) {
   registry->AddInterface(
       base::Bind(&media::MediaCapsImpl::AddBinding,
                  base::Unretained(cast_browser_main_parts_->media_caps())),
       base::ThreadTaskRunnerHandle::Get());
 }
 
+// When registering an in-process service, also update the manifest overlay in
+// chromecast/browser/BUILD.gn to include the service.
 void CastContentBrowserClient::RegisterInProcessServices(
     StaticServiceMap* services) {
 #if defined(ENABLE_MOJO_MEDIA_IN_BROWSER_PROCESS)
   content::ServiceInfo info;
   info.factory = base::Bind(&CreateMediaService, base::Unretained(this));
   info.task_runner = GetMediaTaskRunner();
   services->insert(std::make_pair("media", info));
 #endif
 }
 
+void CastContentBrowserClient::AddConnectionFilters(
+    ConnectionFilterList* connection_filter_list) {
+  connection_filter_list->push_back(
+      base::MakeUnique<ContentBrowserConnectionFilter>());
+}
+
 std::unique_ptr<base::Value>
 CastContentBrowserClient::GetServiceManifestOverlay(
     const std::string& service_name) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (service_name != content::mojom::kBrowserServiceName)
     return nullptr;
   base::StringPiece manifest_contents =
       rb.GetRawDataResourceForScale(IDR_CAST_CONTENT_BROWSER_MANIFEST_OVERLAY,
                                     ui::ScaleFactor::SCALE_FACTOR_NONE);
   return base::JSONReader::Read(manifest_contents);
@@ skipping 101 matching lines @@
         process_type, dumps_path, false /* upload */);
   // StartUploaderThread() even though upload is diferred.
   // Breakpad-related memory is freed in the uploader thread.
   crash_handler->StartUploaderThread();
   return crash_handler;
 }
 #endif  // !defined(OS_ANDROID)
 
 }  // namespace shell
 }  // namespace chromecast