Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(400)

Unified Diff: chrome/test/base/in_process_browser_test.cc

Issue 1378123003: Adding SSL ETS Tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ets
Patch Set: Rebase. Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/test/base/in_process_browser_test.cc
diff --git a/chrome/test/base/in_process_browser_test.cc b/chrome/test/base/in_process_browser_test.cc
index 8ddb920b1114100e44e5b958cc04f1142673f8cc..b29be89258af5dc58902f9d704abdd31f0e00549 100644
--- a/chrome/test/base/in_process_browser_test.cc
+++ b/chrome/test/base/in_process_browser_test.cc
@@ -59,7 +59,6 @@
#include "content/public/test/test_launcher.h"
#include "content/public/test/test_navigation_observer.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
#if defined(OS_MACOSX)
#include "base/mac/scoped_nsautorelease_pool.h"
@@ -192,7 +191,8 @@ InProcessBrowserTest::InProcessBrowserTest()
// chrome::DIR_TEST_DATA isn't going to be setup until after we call
// ContentMain. However that is after tests' constructors or SetUp methods,
// which sometimes need it. So just override it.
- CHECK(PathService::Override(chrome::DIR_TEST_DATA, test_data_dir));
+ CHECK(PathService::Override(chrome::DIR_TEST_DATA,
+ src_dir.AppendASCII("chrome/test/data")));
#if defined(OS_MACOSX)
bundle_swizzler_.reset(new ScopedBundleSwizzlerMac);

Powered by Google App Engine
This is Rietveld 408576698