Add explicit base to FilePath.

content/test/net/url_request_mock_http_job.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/net/url_request_mock_http_job.h"
 
 #include "base/file_util.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
 #include "net/http/http_response_headers.h"
 #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 {
 
 namespace {
 
 class ProtocolHandler : public net::URLRequestJobFactory::ProtocolHandler {
  public:
   // When |map_all_requests_to_base_path| is true, all request should return the
   // 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) {}
   virtual ~ProtocolHandler() {}
 
   // net::URLRequestJobFactory::ProtocolHandler implementation
   virtual net::URLRequestJob* MaybeCreateJob(
       net::URLRequest* request,
       net::NetworkDelegate* network_delegate) const OVERRIDE {
     return new URLRequestMockHTTPJob(request, network_delegate,
         map_all_requests_to_base_path_ ? base_path_ : GetOnDiskPath(request));
   }
 
  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);
 };
 
 }  // 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,
       CreateProtocolHandler(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>(
           new ProtocolHandler(file_path, true)));
 
 }
 
 // static
-GURL URLRequestMockHTTPJob::GetMockUrl(const FilePath& path) {
+GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
   std::string url = "http://";
   url.append(kMockHostname);
   url.append("/");
   std::string path_str = path.MaybeAsASCII();
   DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
   url.append(path_str);
   return GURL(url);
 }
 
 // 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());
   return GURL(url);
 }
 
 // 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));
 }
 
 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() { }
 
 // Public virtual version.
 void URLRequestMockHTTPJob::GetResponseInfo(net::HttpResponseInfo* info) {
   // Forward to private const version.
   GetResponseInfoConst(info);
 }
 
 bool URLRequestMockHTTPJob::IsRedirectResponse(GURL* location,
                                                int* http_status_code) {
   // Override the net::URLRequestFileJob implementation to invoke the default
   // one based on HttpResponseInfo.
   return net::URLRequestJob::IsRedirectResponse(location, http_status_code);
 }
 
 // Private const version.
 void URLRequestMockHTTPJob::GetResponseInfoConst(
     net::HttpResponseInfo* info) const {
   // We have to load our headers from disk, but we only use this class
   // 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;
 
   // ParseRawHeaders expects \0 to end each header line.
   ReplaceSubstringsAfterOffset(&raw_headers, 0, "\n", std::string("\0", 1));
   info->headers = new net::HttpResponseHeaders(raw_headers);
 }
 
 bool URLRequestMockHTTPJob::GetMimeType(std::string* mime_type) const {
@@ skipping 11 matching lines @@
   return net::URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   net::HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers && info.headers->GetCharset(charset);
 }
 
 }  // namespace content