Move extension/webstore-related URL getters to the extension_urls namespace.

chrome/browser/extensions/extension_webstore_private_api.cc

 // Copyright (c) 2011 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 "chrome/browser/extensions/extension_webstore_private_api.h"
 
 #include <string>
 #include <vector>
 
 #include "base/scoped_temp_dir.h"
@@ skipping 14 matching lines @@
 #include "chrome/common/chrome_utility_messages.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/net/gaia/gaia_constants.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_details.h"
 #include "content/common/notification_source.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
-#include "net/base/escape.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
 const char kAppInstallBubbleKey[] = "appInstallBubble";
 const char kIconDataKey[] = "iconData";
 const char kIdKey[] = "id";
 const char kLocalizedNameKey[] = "localizedName";
 const char kLoginKey[] = "login";
 const char kManifestKey[] = "manifest";
@@ skipping 462 matching lines @@
     return false;
   }
 
   if (!CrxInstaller::IsIdWhitelisted(id) &&
       !CrxInstaller::GetWhitelistEntry(id)) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(
         kNoPreviousBeginInstallError, id);
     return false;
   }
 
-  std::vector<std::string> params;
-  params.push_back("id=" + id);
-  params.push_back("lang=" + g_browser_process->GetApplicationLocale());
-  params.push_back("uc");
-  std::string url_string = Extension::GalleryUpdateUrl(true).spec();
-
-  GURL url(url_string + "?response=redirect&x=" +
-      EscapeQueryParamValue(JoinString(params, '&'), true));
-  DCHECK(url.is_valid());
+  GURL install_url(extension_urls::GetWebstoreInstallUrl(
+      id, g_browser_process->GetApplicationLocale()));
 
   // The download url for the given |id| is now contained in |url|. We
   // navigate the current (calling) tab to this url which will result in a
   // download starting. Once completed it will go through the normal extension
   // install flow. The above call to SetWhitelistedInstallId will bypass the
   // normal permissions install dialog.
   NavigationController& controller =
       dispatcher()->delegate()->GetAssociatedTabContents()->controller();
-  controller.LoadURL(url, source_url(), PageTransition::LINK);
+  controller.LoadURL(install_url, source_url(), PageTransition::LINK);
 
   return true;
 }
 
 bool GetBrowserLoginFunction::RunImpl() {
   if (!IsWebStoreURL(profile_, source_url()))
     return false;
   result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
   return true;
 }
@@ skipping 131 matching lines @@
   }
 
   DCHECK(waiting_for_token_);
 
   result_.reset(CreateLoginResult(profile_->GetOriginalProfile()));
   SendResponse(true);
 
   // Matches the AddRef in RunImpl().
   Release();
 }