Index: content/test/content_browser_test.cc |
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc |
index 9ed527a2d7bcc2ac247f439a86cedd5157faa539..1cebde7f4d063a42c802b1a7b0ac033333b7dd6c 100644 |
--- a/content/test/content_browser_test.cc |
+++ b/content/test/content_browser_test.cc |
@@ -10,6 +10,7 @@ |
#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" |
@@ -19,6 +20,7 @@ |
#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" |
@@ -42,6 +44,8 @@ ContentBrowserTest::ContentBrowserTest() { |
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
|
+ DIR_TEST_DATA, base::FilePath())); |
} |
ContentBrowserTest::~ContentBrowserTest() { |