Add std::string versions of URLRequestMockHTTPJob::GetMockUrl and GetMockHttpsUrl.

net/test/url_request/url_request_mock_http_job.h

 // 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.
 //
 // A URLRequestJob class that pulls the net and http headers from disk.
 
 #ifndef NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_
 #define NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_
 
 #include <string>
@@ skipping 30 matching lines @@
   void GetResponseInfo(HttpResponseInfo* info) override;
   bool IsRedirectResponse(GURL* location, int* http_status_code) override;
 
   // Adds the testing URLs to the URLRequestFilter, both under HTTP and HTTPS.
   static void AddUrlHandlers(
       const base::FilePath& base_path,
       const scoped_refptr<base::SequencedWorkerPool>& worker_pool);
 
   // Given the path to a file relative to the path passed to AddUrlHandler(),
   // construct a mock URL.
+  static GURL GetMockUrl(const std::string& path);
+  static GURL GetMockHttpsUrl(const std::string& path);
+
+  // Like above, but takes a FilePath. These methods are deprecated. Prefer the
+  // std::string versions. See http://crbug.com/496936.
   static GURL GetMockUrl(const base::FilePath& path);
   static GURL GetMockHttpsUrl(const base::FilePath& path);
 
   // Returns a URLRequestJobFactory::ProtocolHandler that serves
   // URLRequestMockHTTPJob's responding like an HTTP server. |base_path| is the
   // file path leading to the root of the directory to use as the root of the
   // HTTP server.
   static scoped_ptr<URLRequestInterceptor> CreateInterceptor(
       const base::FilePath& base_path,
       const scoped_refptr<base::SequencedWorkerPool>& worker_pool);
@@ skipping 16 matching lines @@
   const scoped_refptr<base::TaskRunner> task_runner_;
 
   base::WeakPtrFactory<URLRequestMockHTTPJob> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestMockHTTPJob);
 };
 
 }  // namespace net
 
 #endif  // NET_TEST_URL_REQUEST_URL_REQUEST_MOCK_HTTP_JOB_H_