GTTF: Convert WebContentsImplBrowserTest to use EmbeddedTestServer.

content/test/content_browser_test.cc

 // Copyright (c) 2011 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 "content/test/content_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/content_paths.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/url_constants.h"
 #include "content/shell/app/shell_main_delegate.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/renderer/shell_content_renderer_client.h"
 #include "content/shell/shell.h"
 #include "content/shell/shell_browser_context.h"
 #include "content/shell/shell_content_browser_client.h"
 #include "content/test/test_content_client.h"
+#include "net/test/embedded_test_server/embedded_test_server.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/scoped_nsautorelease_pool.h"
 #endif
 
 namespace content {
 
 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
   // Ensures that tests with MANUAL_ prefix don't run automatically.
   ASSERT_TRUE(false);
 }
 
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
   base::FilePath content_shell_path;
   CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
   content_shell_path = content_shell_path.DirName();
   content_shell_path = content_shell_path.Append(
       FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
   CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
 #endif
   CreateTestServer(base::FilePath(FILE_PATH_LITERAL("content/test/data")));
+  EXPECT_TRUE(embedded_test_server()->ServeFilesFromDirectory(

[satorux1, 2013/05/16 04:57:59]

Not sure if it's a good idea to use EXPECT* in the test constructor. If this
fails, is this considered a test failure? The semantic is unclear to me. 

I'd suggest

FilePath test_data_dir_path;
CHECK(PathService::Get(DIR_TEST_DATA, &test_dir_path));
embedded_test_server()->ServeFilesFromDirectory(test_data_dir_path);

+                  DIR_TEST_DATA, base::FilePath()));
 }
 
 ContentBrowserTest::~ContentBrowserTest() {
 }
 
 void ContentBrowserTest::SetUp() {
   shell_main_delegate_.reset(new ShellMainDelegate);
   shell_main_delegate_->PreSandboxStartup();
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
@@ skipping 86 matching lines @@
 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() {
   return Shell::CreateNewWindow(
       ShellContentBrowserClient::Get()->off_the_record_browser_context(),
       GURL(kAboutBlankURL),
       NULL,
       MSG_ROUTING_NONE,
       gfx::Size());
 }
 
 }  // namespace content