Revert 279557 "Support exposing Mojo services between render fra..."

trunk/src/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 <limits>
 
 #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"
 #include "content/browser/webui/web_ui_controller_factory_registry.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/render_frame_host.h"
-#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui_controller.h"
 #include "content/public/browser/web_ui_data_source.h"
 #include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
-#include "content/public/common/service_registry.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/test/content_browser_test.h"
 #include "content/public/test/content_browser_test_utils.h"
-#include "content/shell/browser/shell.h"
 #include "content/test/data/web_ui_test_mojo_bindings.mojom.h"
 #include "grit/content_resources.h"
 #include "mojo/common/test/test_utils.h"
 #include "mojo/public/js/bindings/constants.h"
 
 namespace content {
 namespace {
 
 bool got_message = false;
 
@@ skipping 84 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TestWebUIController);
 };
 
 // TestWebUIController that additionally creates the ping test BrowserTarget
 // implementation at the right time.
 class PingTestWebUIController : public TestWebUIController {
  public:
    PingTestWebUIController(WebUI* web_ui, base::RunLoop* run_loop)
        : TestWebUIController(web_ui, run_loop) {
    }
-   virtual ~PingTestWebUIController() {}
 
   // WebUIController overrides:
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE {
-    render_view_host->GetMainFrame()->GetServiceRegistry()->AddService(
-        "webui_controller",
-        base::Bind(&PingTestWebUIController::CreateHandler,
-                   base::Unretained(this)));
-  }
-
-  void CreateHandler(mojo::ScopedMessagePipeHandle handle) {
-    browser_target_.reset(new PingBrowserTargetImpl(handle.Pass(), run_loop_));
+    mojo::MessagePipe pipe;
+    browser_target_.reset(
+        new PingBrowserTargetImpl(pipe.handle0.Pass(), run_loop_));
+    render_view_host->SetWebUIHandle(pipe.handle1.Pass());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(PingTestWebUIController);
 };
 
 // WebUIControllerFactory that creates TestWebUIController.
 class TestWebUIControllerFactory : public WebUIControllerFactory {
  public:
   TestWebUIControllerFactory() : run_loop_(NULL) {}
@@ skipping 60 matching lines @@
 
   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?ping"));
   NavigateToURL(shell(), test_url);
   // RunLoop is quit when message received from page.
   run_loop.Run();
   EXPECT_TRUE(got_message);
-
-  // Check that a second render frame in the same renderer process works
-  // correctly.
-  Shell* other_shell = CreateBrowser();
-  got_message = false;
-  base::RunLoop other_run_loop;
-  factory()->set_run_loop(&other_run_loop);
-  NavigateToURL(other_shell, test_url);
-  // RunLoop is quit when message received from page.
-  other_run_loop.Run();
-  EXPECT_TRUE(got_message);
-  EXPECT_EQ(shell()->web_contents()->GetRenderProcessHost(),
-            other_shell->web_contents()->GetRenderProcessHost());
 }
 
 }  // namespace
 }  // namespace content