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

Unified Diff: content/test/layout_browsertest.h

Issue 12208057: Add explicit base to FilePath. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
« no previous file with comments | « content/test/gpu/gpu_test_expectations_parser.cc ('k') | content/test/layout_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/layout_browsertest.h
diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h
index 583bac2a401aed91ca2e211d523da8cc3ed31482..626ef5c015e13b5e717db33fc16f0407fe80a12b 100644
--- a/content/test/layout_browsertest.h
+++ b/content/test/layout_browsertest.h
@@ -14,8 +14,8 @@ class WebKitTestController;
class InProcessBrowserLayoutTest : public ContentBrowserTest {
public:
- explicit InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
- const FilePath& test_case_dir);
+ explicit InProcessBrowserLayoutTest(const base::FilePath& test_parent_dir,
+ const base::FilePath& test_case_dir);
// Used when running HTTP layout tests. Starts the server in the constructor
// and keeps it running through the lifetime of this test. This is done to
// avoid flakiness in restarting the server while the port is still in use.
@@ -23,8 +23,8 @@ class InProcessBrowserLayoutTest : public ContentBrowserTest {
// recommended when possible, in case multiple tests are running at the same
// time. For some tests this isn't possible though, because they use resources
// that hardcode a specific port.
- InProcessBrowserLayoutTest(const FilePath& test_parent_dir,
- const FilePath& test_case_dir,
+ InProcessBrowserLayoutTest(const base::FilePath& test_parent_dir,
+ const base::FilePath& test_case_dir,
int port);
virtual ~InProcessBrowserLayoutTest();
@@ -44,12 +44,12 @@ class InProcessBrowserLayoutTest : public ContentBrowserTest {
std::string SaveResults(const std::string& expected,
const std::string& actual);
- FilePath layout_test_dir_;
- FilePath test_parent_dir_;
- FilePath test_case_dir_;
- FilePath rebase_result_dir_;
- FilePath rebase_result_chromium_dir_;
- FilePath rebase_result_win_dir_;
+ base::FilePath layout_test_dir_;
+ base::FilePath test_parent_dir_;
+ base::FilePath test_case_dir_;
+ base::FilePath rebase_result_dir_;
+ base::FilePath rebase_result_chromium_dir_;
+ base::FilePath rebase_result_win_dir_;
int port_; // -2 means no port. -1 means random.
scoped_ptr<LayoutTestHttpServer> test_http_server_;
« no previous file with comments | « content/test/gpu/gpu_test_expectations_parser.cc ('k') | content/test/layout_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698