Avoid parsing the webstore base url so much.

extensions/common/extension_urls.cc

Index: extensions/common/extension_urls.cc
diff --git a/extensions/common/extension_urls.cc b/extensions/common/extension_urls.cc
index 0235621c76fe9a981de848c4470b72d9696e4b05..ef82c22929ecfecd1afeea4fa4d18c40948c0d22 100644
--- a/extensions/common/extension_urls.cc
+++ b/extensions/common/extension_urls.cc
@@ -33,35 +33,39 @@ const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore";
 const char kChromeWebstoreUpdateURL[] =
     "https://clients2.google.com/service/update2/crx";
 
-std::string GetWebstoreLaunchURL() {
+GURL GetWebstoreLaunchURL() {
   extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get();
   if (client)
     return client->GetWebstoreBaseURL();
-  return kChromeWebstoreBaseURL;
+  return GURL(kChromeWebstoreBaseURL);
 }
 
+// TODO(csharrison,rdevlin.cronin): Migrate the following methods to return
+// GURLs.
+
 std::string GetWebstoreExtensionsCategoryURL() {
-  return GetWebstoreLaunchURL() + "/category/extensions";
+  return GetWebstoreLaunchURL().Resolve("/category/extensions").spec();

[Charlie Harrison, 2016/11/21 01:21:24]

Using Resolve() here and below is causing subtle errors with the tests. Fixing
the root causes is becoming troublesome.

The problem is that Resolving with relative URL with a leading "/" means we
consider it an absolute URL, so we remove the existing path component of the
launch url.

To resolve right, we also need the launch URL (with a path) to end with a "/".
Unfortunately for some tests (e.g. WebstoreStartupInstallUnpackFailureTest),
this is a bit tricky to do, as test infrastructure relies in a few places on it
not having a trailing slash.

Would you mind if I reverted these changes to use Resolve?

[Devlin, 2016/11/21 15:39:32]

Reverting is fine.  Can you add a TODO(devlin) to use some GURL method rather
than doing the string addition though?

 }
 
 std::string GetWebstoreItemDetailURLPrefix() {
-  return GetWebstoreLaunchURL() + "/detail/";
+  return GetWebstoreLaunchURL().Resolve("/detail/").spec();
 }
 
 GURL GetWebstoreItemJsonDataURL(const std::string& extension_id) {
-  return GURL(GetWebstoreLaunchURL() + "/inlineinstall/detail/" + extension_id);
+  return GURL(GetWebstoreLaunchURL().spec() + "/inlineinstall/detail/" +
+              extension_id);
 }
 
 GURL GetWebstoreJsonSearchUrl(const std::string& query,
                               const std::string& host_language_code) {
-  GURL url(GetWebstoreLaunchURL() + "/jsonsearch");
+  GURL url(GetWebstoreLaunchURL().spec() + "/jsonsearch");
   url = net::AppendQueryParameter(url, "q", query);
   url = net::AppendQueryParameter(url, "hl", host_language_code);
   return url;
 }
 
 GURL GetWebstoreSearchPageUrl(const std::string& query) {
-  return GURL(GetWebstoreLaunchURL() + "/search/" +
+  return GURL(GetWebstoreLaunchURL().spec() + "/search/" +
               net::EscapeQueryParamValue(query, false));
 }
 
@@ -75,7 +79,7 @@ GURL GetWebstoreUpdateUrl() {
 GURL GetWebstoreReportAbuseUrl(const std::string& extension_id,
                                const std::string& referrer_id) {
   return GURL(base::StringPrintf("%s/report/%s?utm_source=%s",
-                                 GetWebstoreLaunchURL().c_str(),
+                                 GetWebstoreLaunchURL().spec().c_str(),
                                  extension_id.c_str(), referrer_id.c_str()));
 }