Migrating tests to use EmbeddedTestServer (/content)

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/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/run_loop.h"
@@ skipping 11 matching lines @@
 #include "content/public/common/service_registry.h"
 #include "content/public/common/url_utils.h"
 #include "content/public/test/browser_test_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 "mojo/test/test_utils.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/binding.h"
 #include "third_party/mojo/src/mojo/public/cpp/bindings/interface_request.h"
 #include "third_party/mojo/src/mojo/public/js/constants.h"

[mmenke, 2015/11/03 19:12:57]

include embedded_test_server.h

[svaldez, 2015/11/03 19:33:16]

Done.

 
 namespace content {
 namespace {
 
 bool got_message = false;
 
 // 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) {
@@ skipping 151 matching lines @@
 }
 
 // Loads a webui page that contains mojo bindings and verifies a message makes
 // it from the browser to the page and back.
 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, EndToEndPing) {
   if (!IsGeneratedResourceAvailable(
           "content/test/data/web_ui_test_mojo_bindings.mojom"))
     return;
 
   got_message = false;
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_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"));
+  GURL test_url(embedded_test_server()->GetURL("/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());
 }
 
 // Loads a webui page that connects to a test Mojo application via the browser's
 // Mojo shell interface.
 IN_PROC_BROWSER_TEST_F(WebUIMojoTest, ConnectToApplication) {
   if (!IsGeneratedResourceAvailable(
           "content/public/test/test_mojo_service.mojom"))
     return;
 
-  ASSERT_TRUE(test_server()->Start());
+  ASSERT_TRUE(embedded_test_server()->Start());
   NavigateToURL(shell(),
-                test_server()->GetURL("files/web_ui_mojo_shell_test.html"));
+                embedded_test_server()->GetURL("/web_ui_mojo_shell_test.html"));
 
   DOMMessageQueue message_queue;
   std::string message;
   ASSERT_TRUE(message_queue.WaitForMessage(&message));
   EXPECT_EQ("true", message);
 }
 
 }  // namespace
 }  // namespace content