Mojo: update web ui for the addition of connection.js and router.js

content/browser/webui/web_ui_mojo_browsertest.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
@@ skipping 30 matching lines @@
   base::FilePath file_path;
   PathService::Get(CHILD_PROCESS_EXE, &file_path);
   return file_path.DirName().AppendASCII(binding_path);
 }
 
 // The bindings for the page are generated from a .mojom file. This code looks
 // 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::kCodecModuleName || id == mojo::kConnectorModuleName)
+  if (id == mojo::kCodecModuleName ||
+      id == mojo::kConnectionModuleName ||
+      id == mojo::kConnectorModuleName ||
+      id == mojo::kRouterModuleName)
     return false;
 
   std::string contents;
   CHECK(base::ReadFileToString(GetFilePathForJSResource(id), &contents,
                                std::string::npos));
   base::RefCountedString* ref_contents = new base::RefCountedString;
   ref_contents->data() = contents;
   callback.Run(ref_contents);
   return true;
 }
@@ skipping 97 matching lines @@
   TestWebUIControllerFactory* factory() { return &factory_; }
 
  private:
   TestWebUIControllerFactory factory_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIMojoTest);
 };
 
 // Loads a webui page that contains mojo bindings and verifies a message makes
 // it from the browser to the page and back.
-// http://crbug.com/357308
-IN_PROC_BROWSER_TEST_F(WebUIMojoTest, DISABLED_EndToEnd) {
+IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEnd) {
   // Currently there is no way to have a generated file included in the isolate
   // files. If the bindings file doesn't exist assume we're on such a bot and
   // pass.
   // TODO(sky): remove this conditional when isolates support copying from gen.
   const base::FilePath test_file_path(
       GetFilePathForJSResource(
           "content/test/data/web_ui_test_mojo_bindings.mojom"));
   if (!base::PathExists(test_file_path)) {
     LOG(WARNING) << " mojom binding file doesn't exist, assuming on isolate";
     return;
   }
 
   got_message = false;
   ASSERT_TRUE(test_server()->Start());
   base::RunLoop run_loop;
   factory()->set_run_loop(&run_loop);
   GURL test_url(test_server()->GetURL("files/web_ui_mojo.html"));
   NavigateToURL(shell(), test_url);
   // RunLoop is quit when message received from page.
   run_loop.Run();
   EXPECT_TRUE(got_message);
 }
 
 }  // namespace
 }  // namespace content