Add explicit base to FilePath.

This changes the "easy" content subdirectories (everything but browser, renderer, and common) and the ppapi top level directory.

Review URL: https://codereview.chromium.org/12208057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181191 0039d316-1c4b-4281-b951-d872f2087c98

16 files changed, 66 insertions, 61 deletions

diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc
index c02cd9e..74cee29 100644
--- a/content/test/content_browser_test.cc
+++ b/content/test/content_browser_test.cc
@@ -34,14 +34,14 @@ IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) {
 ContentBrowserTest::ContentBrowserTest() {
 #if defined(OS_MACOSX)
   // See comment in InProcessBrowserTest::InProcessBrowserTest().
-  FilePath content_shell_path;
+  base::FilePath content_shell_path;
   CHECK(PathService::Get(base::FILE_EXE, &content_shell_path));
   content_shell_path = content_shell_path.DirName();
   content_shell_path = content_shell_path.Append(
       FILE_PATH_LITERAL("Content Shell.app/Contents/MacOS/Content Shell"));
   CHECK(PathService::Override(base::FILE_EXE, content_shell_path));
 #endif
-  CreateTestServer(FilePath(FILE_PATH_LITERAL("content/test/data")));
+  CreateTestServer(base::FilePath(FILE_PATH_LITERAL("content/test/data")));
 }
 
 ContentBrowserTest::~ContentBrowserTest() {
@@ -66,7 +66,7 @@ void ContentBrowserTest::SetUp() {
 
 #if defined(OS_MACOSX)
   // See InProcessBrowserTest::PrepareTestCommandLine().
-  FilePath subprocess_path;
+  base::FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   subprocess_path = subprocess_path.DirName().DirName();
   DCHECK_EQ(subprocess_path.BaseName().value(), "Contents");
diff --git a/content/test/content_browser_test_utils.cc b/content/test/content_browser_test_utils.cc
index b8c64c3..b1c2e51 100644
--- a/content/test/content_browser_test_utils.cc
+++ b/content/test/content_browser_test_utils.cc
@@ -21,11 +21,11 @@
 
 namespace content {
 
-FilePath GetTestFilePath(const char* dir, const char* file) {
-  FilePath path;
+base::FilePath GetTestFilePath(const char* dir, const char* file) {
+  base::FilePath path;
   PathService::Get(DIR_TEST_DATA, &path);
-  return path.Append(
-      FilePath().AppendASCII(dir).Append(FilePath().AppendASCII(file)));
+  return path.Append(base::FilePath().AppendASCII(dir).Append(
+      base::FilePath().AppendASCII(file)));
 }
 
 GURL GetTestUrl(const char* dir, const char* file) {
diff --git a/content/test/content_test_launcher.cc b/content/test/content_test_launcher.cc
index 4a853cf..aa1f362 100644
--- a/content/test/content_test_launcher.cc
+++ b/content/test/content_test_launcher.cc
@@ -112,7 +112,7 @@ class ContentTestLauncherDelegate : public TestLauncherDelegate {
   }
 
   virtual bool AdjustChildProcessCommandLine(
-      CommandLine* command_line, const FilePath& temp_data_dir) OVERRIDE {
+      CommandLine* command_line, const base::FilePath& temp_data_dir) OVERRIDE {
     command_line->AppendSwitchPath(switches::kContentShellDataPath,
                                    temp_data_dir);
     command_line->AppendSwitch(switches::kUseFakeDeviceForMediaStream);
diff --git a/content/test/gpu/gpu_test_expectations_parser.cc b/content/test/gpu/gpu_test_expectations_parser.cc
index debcb79..fd0d7d7 100644
--- a/content/test/gpu/gpu_test_expectations_parser.cc
+++ b/content/test/gpu/gpu_test_expectations_parser.cc
@@ -186,7 +186,8 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const std::string& data) {
   return rt;
 }
 
-bool GPUTestExpectationsParser::LoadTestExpectations(const FilePath& path) {
+bool GPUTestExpectationsParser::LoadTestExpectations(
+    const base::FilePath& path) {
   entries_.clear();
   error_messages_.clear();
 
@@ -200,7 +201,7 @@ bool GPUTestExpectationsParser::LoadTestExpectations(const FilePath& path) {
 
 bool GPUTestExpectationsParser::LoadTestExpectations(
     GPUTestProfile profile) {
-  FilePath path;
+  base::FilePath path;
   if (!GetExpectationsPath(profile, &path))
     return false;
   return LoadTestExpectations(path);
@@ -504,7 +505,7 @@ void GPUTestExpectationsParser::PushErrorMessage(
 
 // static
 bool GPUTestExpectationsParser::GetExpectationsPath(
-    GPUTestProfile profile, FilePath* path) {
+    GPUTestProfile profile, base::FilePath* path) {
   DCHECK(path);
 
   bool rt = true;
diff --git a/content/test/gpu/gpu_test_expectations_parser.h b/content/test/gpu/gpu_test_expectations_parser.h
index 215096d..c80a280 100644
--- a/content/test/gpu/gpu_test_expectations_parser.h
+++ b/content/test/gpu/gpu_test_expectations_parser.h
@@ -33,7 +33,7 @@ class GPUTestExpectationsParser {
   // save all the entries. Otherwise, generate error messages.
   // Return true if parsing succeeds.
   bool LoadTestExpectations(const std::string& data);
-  bool LoadTestExpectations(const FilePath& path);
+  bool LoadTestExpectations(const base::FilePath& path);
   bool LoadTestExpectations(GPUTestProfile profile);
 
   // Query error messages from the last LoadTestExpectations() call.
@@ -82,7 +82,7 @@ class GPUTestExpectationsParser {
 
   // Return false if an error occurs or the path does not exist.
   static bool GetExpectationsPath(GPUTestProfile profile,
-                                  FilePath* path);
+                                  base::FilePath* path);
 
   std::vector<GPUTestExpectationEntry> entries_;
   std::vector<std::string> error_messages_;
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
index 3d38e18..8b15d81 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()));
diff --git a/content/test/layout_browsertest.h b/content/test/layout_browsertest.h
index 583bac2..626ef5c 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_;
 
diff --git a/content/test/layout_test_http_server.cc b/content/test/layout_test_http_server.cc
index 603a479..23c972a 100644
--- a/content/test/layout_test_http_server.cc
+++ b/content/test/layout_test_http_server.cc
@@ -20,14 +20,14 @@ namespace content {
 namespace {
 
 bool PrepareCommandLine(CommandLine* cmd_line) {
-  FilePath src_path;
+  base::FilePath src_path;
   if (!PathService::Get(base::DIR_SOURCE_ROOT, &src_path))
     return false;
 
   if (!GetPythonCommand(cmd_line))
     return false;
 
-  FilePath script_path(src_path);
+  base::FilePath script_path(src_path);
   script_path = script_path.AppendASCII("third_party");
   script_path = script_path.AppendASCII("WebKit");
   script_path = script_path.AppendASCII("Tools");
@@ -40,7 +40,7 @@ bool PrepareCommandLine(CommandLine* cmd_line) {
 
 }  // namespace
 
-LayoutTestHttpServer::LayoutTestHttpServer(const FilePath& root_directory,
+LayoutTestHttpServer::LayoutTestHttpServer(const base::FilePath& root_directory,
                                            int port)
     : root_directory_(root_directory),
       port_(port),
@@ -67,7 +67,7 @@ bool LayoutTestHttpServer::Start() {
                            root_directory_.value());
   cmd_line.AppendArg("--port=" + base::IntToString(port_));
 
-  FilePath layout_tests_dir;
+  base::FilePath layout_tests_dir;
   if (!PathService::Get(DIR_LAYOUT_TESTS, &layout_tests_dir))
     return false;
   cmd_line.AppendArgNative(FILE_PATH_LITERAL("--layout_tests_dir=") +
diff --git a/content/test/layout_test_http_server.h b/content/test/layout_test_http_server.h
index 709c1ec..66035b6 100644
--- a/content/test/layout_test_http_server.h
+++ b/content/test/layout_test_http_server.h
@@ -21,7 +21,7 @@ namespace content {
 // a more lightweight net/test/test_server HTTP server.
 class LayoutTestHttpServer {
  public:
-  LayoutTestHttpServer(const FilePath& root_directory, int port);
+  LayoutTestHttpServer(const base::FilePath& root_directory, int port);
   ~LayoutTestHttpServer();
 
   // Starts the server. Returns true on success.
@@ -38,7 +38,7 @@ class LayoutTestHttpServer {
   int port() const { return port_; }
 
  private:
-  FilePath root_directory_;  // Root directory of the server.
+  base::FilePath root_directory_;  // Root directory of the server.
 
   int port_;  // Port on which the server should listen.
 
diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc
index 79a77dc..404882c 100644
--- a/content/test/net/url_request_mock_http_job.cc
+++ b/content/test/net/url_request_mock_http_job.cc
@@ -15,7 +15,7 @@
 #include "net/url_request/url_request_filter.h"
 
 const char kMockHostname[] = "mock.http";
-const FilePath::CharType kMockHeaderFileSuffix[] =
+const base::FilePath::CharType kMockHeaderFileSuffix[] =
     FILE_PATH_LITERAL(".mock-http-headers");
 
 namespace content {
@@ -28,7 +28,7 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
   // contents of the file at |base_path|. When |map_all_requests_to_base_path|
   // is false, |base_path| is the file path leading to the root of the directory
   // to use as the root of the HTTP server.
-  explicit ProtocolHandler(const FilePath& base_path,
+  explicit ProtocolHandler(const base::FilePath& base_path,
                            bool map_all_requests_to_base_path)
       : base_path_(base_path),
         map_all_requests_to_base_path_(map_all_requests_to_base_path) {}
@@ -43,19 +43,19 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
   }
 
  private:
-  FilePath GetOnDiskPath(net::URLRequest* request) const {
+  base::FilePath GetOnDiskPath(net::URLRequest* request) const {
     // Conceptually we just want to "return base_path_ + request->url().path()".
     // But path in the request URL is in URL space (i.e. %-encoded spaces).
     // So first we convert base FilePath to a URL, then append the URL
     // path to that, and convert the final URL back to a FilePath.
     GURL file_url(net::FilePathToFileURL(base_path_));
     std::string url = file_url.spec() + request->url().path();
-    FilePath file_path;
+    base::FilePath file_path;
     net::FileURLToFilePath(GURL(url), &file_path);
     return file_path;
   }
 
-  const FilePath base_path_;
+  const base::FilePath base_path_;
   const bool map_all_requests_to_base_path_;
 
   DISALLOW_COPY_AND_ASSIGN(ProtocolHandler);
@@ -64,7 +64,7 @@ class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
 }  // namespace
 
 // static
-void URLRequestMockHTTPJob::AddUrlHandler(const FilePath& base_path) {
+void URLRequestMockHTTPJob::AddUrlHandler(const base::FilePath& base_path) {
   // Add kMockHostname to net::URLRequestFilter.
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameProtocolHandler("http", kMockHostname,
@@ -74,7 +74,7 @@ void URLRequestMockHTTPJob::AddUrlHandler(const FilePath& base_path) {
 // static
 void URLRequestMockHTTPJob::AddHostnameToFileHandler(
     const std::string& hostname,
-    const FilePath& file_path) {
+    const base::FilePath& file_path) {
   net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
   filter->AddHostnameProtocolHandler("http", hostname,
       scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
@@ -83,7 +83,7 @@ void URLRequestMockHTTPJob::AddHostnameToFileHandler(
 }
 
 // static
-GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) {
+GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
@@ -94,7 +94,7 @@ GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) {
 }
 
 // static
-GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) {
+GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const base::FilePath& path) {
   std::string url = chrome::kViewSourceScheme;
   url.append(":");
   url.append(GetMockUrl(path).spec());
@@ -103,7 +103,7 @@ GURL URLRequestMockHTTPJob::GetMockViewSourceUrl(const FilePath& path) {
 
 // static
 scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>
-URLRequestMockHTTPJob::CreateProtocolHandler(const FilePath& base_path) {
+URLRequestMockHTTPJob::CreateProtocolHandler(const base::FilePath& base_path) {
   return scoped_ptr<net::URLRequestJobFactory::ProtocolHandler>(
       new ProtocolHandler(base_path, false));
 }
@@ -111,7 +111,7 @@ URLRequestMockHTTPJob::CreateProtocolHandler(const FilePath& base_path) {
 URLRequestMockHTTPJob::URLRequestMockHTTPJob(
     net::URLRequest* request,
     net::NetworkDelegate* network_delegate,
-    const FilePath& file_path)
+    const base::FilePath& file_path)
     : net::URLRequestFileJob(request, network_delegate, file_path) { }
 
 URLRequestMockHTTPJob::~URLRequestMockHTTPJob() { }
@@ -136,7 +136,8 @@ void URLRequestMockHTTPJob::GetResponseInfoConst(
   // from tests, so allow these IO operations to happen on any thread.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
 
-  FilePath header_file = FilePath(file_path_.value() + kMockHeaderFileSuffix);
+  base::FilePath header_file =
+      base::FilePath(file_path_.value() + kMockHeaderFileSuffix);
   std::string raw_headers;
   if (!file_util::ReadFileToString(header_file, &raw_headers))
     return;
diff --git a/content/test/net/url_request_prepackaged_interceptor.cc b/content/test/net/url_request_prepackaged_interceptor.cc
index 167f9c7..11ad222 100644
--- a/content/test/net/url_request_prepackaged_interceptor.cc
+++ b/content/test/net/url_request_prepackaged_interceptor.cc
@@ -22,7 +22,7 @@ class URLRequestPrepackagedJob : public net::URLRequestFileJob {
  public:
   URLRequestPrepackagedJob(net::URLRequest* request,
                            net::NetworkDelegate* network_delegate,
-                           const FilePath& file_path)
+                           const base::FilePath& file_path)
       : net::URLRequestFileJob(request, network_delegate, file_path) {}
 
   virtual int GetResponseCode() const { return 200; }
@@ -56,7 +56,7 @@ class URLRequestPrepackagedInterceptor::Delegate
   // hostname of |url| must be "localhost" to avoid DNS lookups, and the scheme
   // must be "http".
   void SetResponse(const GURL& url,
-                   const FilePath& path,
+                   const base::FilePath& path,
                    bool ignore_query) {
     CHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     // It's ok to do a blocking disk access on this thread; this class
@@ -77,7 +77,7 @@ class URLRequestPrepackagedInterceptor::Delegate
   }
 
  private:
-  typedef std::map<GURL, FilePath> ResponseMap;
+  typedef std::map<GURL, base::FilePath> ResponseMap;
 
   // When computing matches, this ignores the query parameters of the url.
   virtual net::URLRequestJob* MaybeCreateJob(
@@ -135,7 +135,7 @@ URLRequestPrepackagedInterceptor::~URLRequestPrepackagedInterceptor() {
 }
 
 void URLRequestPrepackagedInterceptor::SetResponse(const GURL& url,
-                                                   const FilePath& path) {
+                                                   const base::FilePath& path) {
   CHECK_EQ("http", url.scheme());
   CHECK_EQ("localhost", url.host());
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
@@ -146,7 +146,7 @@ void URLRequestPrepackagedInterceptor::SetResponse(const GURL& url,
 
 void URLRequestPrepackagedInterceptor::SetResponseIgnoreQuery(
     const GURL& url,
-    const FilePath& path) {
+    const base::FilePath& path) {
   CHECK_EQ("http", url.scheme());
   CHECK_EQ("localhost", url.host());
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
diff --git a/content/test/test_content_browser_client.cc b/content/test/test_content_browser_client.cc
index de7be06..c1c054b 100644
--- a/content/test/test_content_browser_client.cc
+++ b/content/test/test_content_browser_client.cc
@@ -31,7 +31,7 @@ WebContentsView* TestContentBrowserClient::OverrideCreateWebContentsView(
 #endif
 }
 
-FilePath TestContentBrowserClient::GetDefaultDownloadDirectory() {
+base::FilePath TestContentBrowserClient::GetDefaultDownloadDirectory() {
   if (!download_dir_.IsValid()) {
     bool result = download_dir_.CreateUniqueTempDir();
     CHECK(result);
diff --git a/content/test/test_content_browser_client.h b/content/test/test_content_browser_client.h
index 2708904..b8b9276 100644
--- a/content/test/test_content_browser_client.h
+++ b/content/test/test_content_browser_client.h
@@ -23,7 +23,7 @@ class TestContentBrowserClient : public ContentBrowserClient {
   virtual WebContentsView* OverrideCreateWebContentsView(
       WebContents* web_contents,
       RenderViewHostDelegateView** render_view_host_delegate_view) OVERRIDE;
-  virtual FilePath GetDefaultDownloadDirectory() OVERRIDE;
+  virtual base::FilePath GetDefaultDownloadDirectory() OVERRIDE;
 
  private:
   // Temporary directory for GetDefaultDownloadDirectory.
diff --git a/content/test/test_content_client.cc b/content/test/test_content_client.cc
index b111de4..4b0f72a 100644
--- a/content/test/test_content_client.cc
+++ b/content/test/test_content_client.cc
@@ -16,7 +16,7 @@ TestContentClient::TestContentClient()
     : data_pack_(ui::SCALE_FACTOR_100P) {
   // content_resources.pak is not built on iOS as it is not required.
 #if !defined(OS_IOS)
-  FilePath content_resources_pack_path;
+  base::FilePath content_resources_pack_path;
 #if defined(OS_ANDROID)
   // on Android all pak files are inside the paks folder.
   PathService::Get(base::DIR_ANDROID_APP_DATA, &content_resources_pack_path);
diff --git a/content/test/webrtc_audio_device_test.cc b/content/test/webrtc_audio_device_test.cc
index 571c4a6..13f79c8 100644
--- a/content/test/webrtc_audio_device_test.cc
+++ b/content/test/webrtc_audio_device_test.cc
@@ -336,8 +336,8 @@ void WebRTCAudioDeviceTest::WaitForMessageLoopCompletion(
 }
 
 std::string WebRTCAudioDeviceTest::GetTestDataPath(
-    const FilePath::StringType& file_name) {
-  FilePath path;
+    const base::FilePath::StringType& file_name) {
+  base::FilePath path;
   EXPECT_TRUE(PathService::Get(DIR_TEST_DATA, &path));
   path = path.Append(file_name);
   EXPECT_TRUE(file_util::PathExists(path));
diff --git a/content/test/webrtc_audio_device_test.h b/content/test/webrtc_audio_device_test.h
index 2e52e94b..3f10bb6 100644
--- a/content/test/webrtc_audio_device_test.h
+++ b/content/test/webrtc_audio_device_test.h
@@ -149,7 +149,7 @@ class WebRTCAudioDeviceTest : public ::testing::Test, public IPC::Listener {
     return *media_internals_.get();
   }
 
-  std::string GetTestDataPath(const FilePath::StringType& file_name);
+  std::string GetTestDataPath(const base::FilePath::StringType& file_name);
 
   scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_;
   MessageLoopForUI message_loop_;