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

net/test/url_request/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 "net/test/url_request/url_request_mock_http_job.h"
 
 #include "base/files/file_util.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 73 matching lines @@
     return "HTTP/1.0 200 OK\n";
   }
 
   std::string raw_headers;
   base::ReadFileToString(header_file, &raw_headers);
   return raw_headers;
 }
 
 // For a given file |path| and |scheme|, return the URL served by the
 // URlRequestMockHTTPJob.
-GURL GetMockUrlForScheme(const base::FilePath& path,
-                         const std::string& scheme) {
-  std::string url = scheme + "://" + kMockHostname + "/";
-  std::string path_str = path.MaybeAsASCII();
-  DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
-  url.append(path_str);
-  return GURL(url);
+GURL GetMockUrlForScheme(const std::string& path, const std::string& scheme) {
+  return GURL(scheme + "://" + kMockHostname + "/" + path);
 }
 
 }  // namespace
 
 // static
 void URLRequestMockHTTPJob::AddUrlHandlers(
     const base::FilePath& base_path,
     const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   // Add kMockHostname to URLRequestFilter, for both HTTP and HTTPS.
   URLRequestFilter* filter = URLRequestFilter::GetInstance();
   filter->AddHostnameInterceptor(
       "http", kMockHostname, CreateInterceptor(base_path, worker_pool));
   filter->AddHostnameInterceptor("https", kMockHostname,
                                  CreateInterceptor(base_path, worker_pool));
 }
 
 // static
+GURL URLRequestMockHTTPJob::GetMockUrl(const std::string& path) {
+  return GetMockUrlForScheme(path, "http");
+}
+
+// static
+GURL URLRequestMockHTTPJob::GetMockHttpsUrl(const std::string& path) {
+  return GetMockUrlForScheme(path, "https");
+}
+
+// static
 GURL URLRequestMockHTTPJob::GetMockUrl(const base::FilePath& path) {
-  return GetMockUrlForScheme(path, "http");
+  std::string path_str = path.MaybeAsASCII();
+  DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
+  return GetMockUrlForScheme(path_str, "http");
 }
 
 // static
 GURL URLRequestMockHTTPJob::GetMockHttpsUrl(const base::FilePath& path) {
-  return GetMockUrlForScheme(path, "https");
+  std::string path_str = path.MaybeAsASCII();
+  DCHECK(!path_str.empty());  // We only expect ASCII paths in tests.
+  return GetMockUrlForScheme(path_str, "https");
 }
 
 // static
 scoped_ptr<URLRequestInterceptor> URLRequestMockHTTPJob::CreateInterceptor(
     const base::FilePath& base_path,
     const scoped_refptr<base::SequencedWorkerPool>& worker_pool) {
   return scoped_ptr<URLRequestInterceptor>(
       new MockJobInterceptor(base_path, false, worker_pool));
 }
 
@@ skipping 71 matching lines @@
   return URLRequestJob::GetResponseCode();
 }
 
 bool URLRequestMockHTTPJob::GetCharset(std::string* charset) {
   HttpResponseInfo info;
   GetResponseInfo(&info);
   return info.headers.get() && info.headers->GetCharset(charset);
 }
 
 }  // namespace net