Add explicit base to FilePath.

content/test/layout_browsertest.cc

 // Copyright (c) 2012 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/layout_browsertest.h"
 
 #include <sstream>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 25 matching lines @@
 static const char kPlatformName[] = "chromium-openbsd";
 #elif defined(OS_ANDROID)
 static const char kPlatformName[] = "chromium-android";
 #else
 #error No known OS defined
 #endif
 
 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"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(
       expected_result_path, expected_result_value);
 }
 
 }  // 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) {
 }
 
 InProcessBrowserLayoutTest::~InProcessBrowserLayoutTest() {
   if (test_http_server_.get())
     CHECK(test_http_server_->Stop());
 }
 
 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_));
 
   // Gets the file path to rebased expected result directory for the current
   // platform.
   //   $LayoutTestRoot/platform/chromium_***/...
   rebase_result_dir_ = src_dir.AppendASCII("platform");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII(kPlatformName);
   rebase_result_dir_ = rebase_result_dir_.Append(test_parent_dir_);
@@ skipping 93 matching lines @@
   if (command_line->HasSwitch(switches::kOutputLayoutTestDifferences)) {
     EXPECT_EQ(expected_text, actual_text) <<
         SaveResults(expected_text, actual_text);
   } else {
     EXPECT_EQ(expected_text, actual_text);
   }
 }
 
 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()));
   EXPECT_NE(-1, file_util::WriteFile(actual_filename,
                                      actual.c_str(),
                                      actual.size()));
   return StringPrintf("Wrote %"PRFilePath" %"PRFilePath,
                       expected_filename.value().c_str(),
                       actual_filename.value().c_str());
 }
 
 }  // namespace content