| Index: content/test/layout_browsertest.cc
|
| diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
|
| index 3d38e182dabed98693aaf2105fc08008b35a00b4..8b15d81c0320778b165410a0c67a4ca383df7dae 100644
|
| --- a/content/test/layout_browsertest.cc
|
| +++ b/content/test/layout_browsertest.cc
|
| @@ -43,10 +43,10 @@ static const char kPlatformName[] = "chromium-android";
|
| namespace content {
|
| namespace {
|
|
|
| -bool ReadExpectedResult(const FilePath& result_dir_path,
|
| +bool ReadExpectedResult(const base::FilePath& result_dir_path,
|
| const std::string test_case_file_name,
|
| std::string* expected_result_value) {
|
| - FilePath expected_result_path(result_dir_path);
|
| + base::FilePath expected_result_path(result_dir_path);
|
| expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
|
| expected_result_path = expected_result_path.InsertBeforeExtension(
|
| FILE_PATH_LITERAL("-expected"));
|
| @@ -59,13 +59,15 @@ bool ReadExpectedResult(const FilePath& result_dir_path,
|
| } // namespace
|
|
|
| InProcessBrowserLayoutTest::InProcessBrowserLayoutTest(
|
| - const FilePath& test_parent_dir, const FilePath& test_case_dir)
|
| + const base::FilePath& test_parent_dir, const base::FilePath& test_case_dir)
|
| : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
|
| port_(-2) {
|
| }
|
|
|
| InProcessBrowserLayoutTest::InProcessBrowserLayoutTest(
|
| - const FilePath& test_parent_dir, const FilePath& test_case_dir, int port)
|
| + const base::FilePath& test_parent_dir,
|
| + const base::FilePath& test_case_dir,
|
| + int port)
|
| : test_parent_dir_(test_parent_dir), test_case_dir_(test_case_dir),
|
| port_(port) {
|
| }
|
| @@ -76,9 +78,9 @@ InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
|
| }
|
|
|
| void InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture() {
|
| - FilePath src_dir;
|
| + base::FilePath src_dir;
|
| ASSERT_TRUE(PathService::Get(DIR_LAYOUT_TESTS, &src_dir));
|
| - FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
|
| + base::FilePath absolute_parent_dir = src_dir.Append(test_parent_dir_);
|
| ASSERT_TRUE(file_util::DirectoryExists(absolute_parent_dir));
|
| layout_test_dir_ = absolute_parent_dir.Append(test_case_dir_);
|
| ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
|
| @@ -192,10 +194,11 @@ void InProcessBrowserLayoutTest::RunLayoutTestInternal(
|
|
|
| std::string InProcessBrowserLayoutTest::SaveResults(const std::string& expected,
|
| const std::string& actual) {
|
| - FilePath cwd;
|
| + base::FilePath cwd;
|
| EXPECT_TRUE(file_util::CreateNewTempDirectory(FILE_PATH_LITERAL(""), &cwd));
|
| - FilePath expected_filename = cwd.Append(FILE_PATH_LITERAL("expected.txt"));
|
| - FilePath actual_filename = cwd.Append(FILE_PATH_LITERAL("actual.txt"));
|
| + base::FilePath expected_filename = cwd.Append(
|
| + FILE_PATH_LITERAL("expected.txt"));
|
| + base::FilePath actual_filename = cwd.Append(FILE_PATH_LITERAL("actual.txt"));
|
| EXPECT_NE(-1, file_util::WriteFile(expected_filename,
|
| expected.c_str(),
|
| expected.size()));
|
|
|