Enable builtin Mojo JS modules in layout tests

This adds a new BindingsPolicy exclusively for enabling
Mojo system API and ServiceRegistry modules to a render
view. Previously these were only made available in
conjunction with WebUI bindings.

While still implied by WebUI bindings availability, Mojo
modules are now also available to any view created during
a layout test run.

Part of a CL series to enable Mojo service mocks in layout
tests:

 1. https://codereview.chromium.org/1468903002
 2. this CL
 3. https://codereview.chromium.org/1470153002

TBR=dbeam@chromium.org for WebUI

Review URL: https://codereview.chromium.org/1470823002

Cr-Commit-Position: refs/heads/master@{#371470}

3 files changed, 0 insertions, 33 deletions

diff --git a/content/browser/webui/web_ui_data_source_impl.cc b/content/browser/webui/web_ui_data_source_impl.cc
index 9a02600..e8b5b9f 100644
--- a/content/browser/webui/web_ui_data_source_impl.cc
+++ b/content/browser/webui/web_ui_data_source_impl.cc
@@ -15,7 +15,6 @@
 #include "content/grit/content_resources.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/content_client.h"
-#include "mojo/public/js/constants.h"
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
@@ -139,24 +138,6 @@ void WebUIDataSourceImpl::SetRequestFilter(
   filter_callback_ = callback;
 }
 
-void WebUIDataSourceImpl::AddMojoResources() {
-  static const struct {
-    const char* path;
-    int id;
-  } resources[] = {
-      {mojo::kBindingsModuleName, IDR_MOJO_BINDINGS_JS},
-      {mojo::kBufferModuleName, IDR_MOJO_BUFFER_JS},
-      {mojo::kCodecModuleName, IDR_MOJO_CODEC_JS},
-      {mojo::kConnectionModuleName, IDR_MOJO_CONNECTION_JS},
-      {mojo::kConnectorModuleName, IDR_MOJO_CONNECTOR_JS},
-      {mojo::kRouterModuleName, IDR_MOJO_ROUTER_JS},
-      {mojo::kUnicodeModuleName, IDR_MOJO_UNICODE_JS},
-      {mojo::kValidatorModuleName, IDR_MOJO_VALIDATOR_JS},
-  };
-  for (size_t i = 0; i < arraysize(resources); ++i)
-    AddResourcePath(resources[i].path, resources[i].id);
-}
-
 void WebUIDataSourceImpl::DisableReplaceExistingSource() {
   replace_existing_source_ = false;
 }
diff --git a/content/browser/webui/web_ui_data_source_impl.h b/content/browser/webui/web_ui_data_source_impl.h
index 7d899a9..b084ba5 100644
--- a/content/browser/webui/web_ui_data_source_impl.h
+++ b/content/browser/webui/web_ui_data_source_impl.h
@@ -38,7 +38,6 @@ class CONTENT_EXPORT WebUIDataSourceImpl
   void SetDefaultResource(int resource_id) override;
   void SetRequestFilter(
       const WebUIDataSource::HandleRequestCallback& callback) override;
-  void AddMojoResources() override;
   void DisableReplaceExistingSource() override;
   void DisableContentSecurityPolicy() override;
   void OverrideContentSecurityPolicyObjectSrc(const std::string& data) override;
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 805f1bb..1d667ee 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -31,7 +31,6 @@
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
-#include "mojo/public/js/constants.h"
 #include "mojo/test/test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 
@@ -44,17 +43,6 @@ bool got_message = false;
 // up the generated file from disk and returns it.
 bool GetResource(const std::string& id,
                  const WebUIDataSource::GotDataCallback& callback) {
-  // These are handled by the WebUIDataSource that AddMojoDataSource() creates.
-  if (id == mojo::kBindingsModuleName ||
-      id == mojo::kBufferModuleName ||
-      id == mojo::kCodecModuleName ||
-      id == mojo::kConnectionModuleName ||
-      id == mojo::kConnectorModuleName ||
-      id == mojo::kUnicodeModuleName ||
-      id == mojo::kRouterModuleName ||
-      id == mojo::kValidatorModuleName)
-    return false;
-
   if (id.find(".mojom") != std::string::npos) {
     std::string contents;
     CHECK(base::ReadFileToString(mojo::test::GetFilePathForJSResource(id),
@@ -110,7 +98,6 @@ class TestWebUIController : public WebUIController {
       : WebUIController(web_ui), run_loop_(run_loop) {
     content::WebUIDataSource* data_source =
         WebUIDataSource::Create("mojo-web-ui");
-    data_source->AddMojoResources();
     data_source->SetRequestFilter(base::Bind(&GetResource));
     content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(),
                                   data_source);