[Media Router] Custom Controls 1 - Add MediaStatus, MediaRouteController, and mojo interfaces

extensions/renderer/dispatcher.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 "extensions/renderer/dispatcher.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 121 matching lines @@
 
 namespace {
 
 static const int64_t kInitialExtensionIdleHandlerDelayMs = 5 * 1000;
 static const int64_t kMaxExtensionIdleHandlerDelayMs = 5 * 60 * 1000;
 static const char kOnSuspendEvent[] = "runtime.onSuspend";
 static const char kOnSuspendCanceledEvent[] = "runtime.onSuspendCanceled";
 
 void CrashOnException(const v8::TryCatch& trycatch) {
   NOTREACHED();
-};
+}
 
 // Calls a method |method_name| in a module |module_name| belonging to the
 // module system from |context|. Intended as a callback target from
 // ScriptContextSet::ForEach.
 void CallModuleMethod(const std::string& module_name,
                       const std::string& method_name,
                       const base::ListValue* args,
                       ScriptContext* context) {
   v8::HandleScope handle_scope(context->isolate());
   v8::Context::Scope context_scope(context->v8_context());
@@ skipping 591 matching lines @@
     {"webViewRequest", IDR_WEB_VIEW_REQUEST_CUSTOM_BINDINGS_JS},
     {"binding", IDR_BINDING_JS},
 
     // Custom types sources.
     {"StorageArea", IDR_STORAGE_AREA_JS},
 
     // Platform app sources that are not API-specific..
     {"platformApp", IDR_PLATFORM_APP_JS},
 
 #if defined(ENABLE_MEDIA_ROUTER)
+    {"chrome/browser/media/router/mojo/media_controller.mojom",

[Nico, 2017/03/23 18:36:49]

This adds many more dependencies from extensions/ to chrome/. Since chrome
already depends, that's an (implicit) dependency cycle, and this does not lgtm.
Please revert this and come up with a way to handle this without this dependency
cycle.

[imcheng, 2017/03/23 19:03:16]

These dependencies need to exist for the Media Router extension to work
properly. If the problem is simply where these mojom files are located in, then
we can move them somewhere else to break the cycle. In
https://codereview.chromium.org/1162243002/ I suggested
//components/media_router., but I think //media/router (or //media/mojo/router)
should work too. Please let me know if that's not the case.

I don't think this warrants a revert. The implicit cycle has existed for quite
some time now and this patch doesn't break anything. I do think it's a good idea
to remove this cycle as soon as we figure out where to relocate the mojom files.

+     IDR_MEDIA_CONTROLLER_MOJOM_JS},
     {"chrome/browser/media/router/mojo/media_router.mojom",
      IDR_MEDIA_ROUTER_MOJOM_JS},
+    {"chrome/browser/media/router/mojo/media_status.mojom",
+     IDR_MEDIA_STATUS_MOJOM_JS},
     {"media_router_bindings", IDR_MEDIA_ROUTER_BINDINGS_JS},
     {"mojo/common/time.mojom", IDR_MOJO_TIME_MOJOM_JS},
     {"net/interfaces/ip_address.mojom", IDR_MOJO_IP_ADDRESS_MOJOM_JS},
     {"url/mojo/origin.mojom", IDR_ORIGIN_MOJOM_JS},
     {"url/mojo/url.mojom", IDR_MOJO_URL_MOJOM_JS},
 #endif  // defined(ENABLE_MEDIA_ROUTER)
   };
 
   if (base::FeatureList::IsEnabled(::features::kGuestViewCrossProcessFrames)) {
     resources.emplace_back("guestViewIframe", IDR_GUEST_VIEW_IFRAME_JS);
@@ skipping 653 matching lines @@
   // The "guestViewDeny" module must always be loaded last. It registers
   // error-providing custom elements for the GuestView types that are not
   // available, and thus all of those types must have been checked and loaded
   // (or not loaded) beforehand.
   if (context_type == Feature::BLESSED_EXTENSION_CONTEXT) {
     module_system->Require("guestViewDeny");
   }
 }
 
 }  // namespace extensions