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

chrome/common/extensions/extension.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/common/extensions/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 235 matching lines @@
                                                  int flags,
                                                  const std::string& explicit_id,
                                                  std::string* error) {
   scoped_refptr<Extension> extension = Create(
       path, location, value, flags, error);
   if (extension.get())
     extension->id_ = explicit_id;
   return extension;
 }
 
-namespace {
-const char* kGalleryUpdateHttpUrl =
-    "http://clients2.google.com/service/update2/crx";
-const char* kGalleryUpdateHttpsUrl =
-    "https://clients2.google.com/service/update2/crx";
-}  // namespace
-
-// static
-GURL Extension::GalleryUpdateUrl(bool secure) {
-  CommandLine* cmdline = CommandLine::ForCurrentProcess();
-  if (cmdline->HasSwitch(switches::kAppsGalleryUpdateURL))
-    return GURL(cmdline->GetSwitchValueASCII(switches::kAppsGalleryUpdateURL));
-  else
-    return GURL(secure ? kGalleryUpdateHttpsUrl : kGalleryUpdateHttpUrl);
-}
-
 // static
 Extension::Location Extension::GetHigherPriorityLocation(
     Extension::Location loc1, Extension::Location loc2) {
   if (loc1 == loc2)
     return loc1;
 
   int loc1_rank = GetLocationRank(loc1);
   int loc2_rank = GetLocationRank(loc2);
 
   // If two different locations have the same rank, then we can not
@@ skipping 2055 matching lines @@
   return true;
 }
 
 GURL Extension::GetHomepageURL() const {
   if (homepage_url_.is_valid())
     return homepage_url_;
 
   if (!UpdatesFromGallery())
     return GURL();
 
-  GURL url(extension_misc::GetWebstoreItemDetailURLPrefix() + id());
+  GURL url(extension_urls::GetWebstoreItemDetailURLPrefix() + id());
   return url;
 }
 
 std::set<FilePath> Extension::GetBrowserImages() const {
   std::set<FilePath> image_paths;
   // TODO(viettrungluu): These |FilePath::FromWStringHack(UTF8ToWide())|
   // indicate that we're doing something wrong.
 
   // Extension icons.
   for (ExtensionIconSet::IconMap::const_iterator iter = icons().map().begin();
@@ skipping 350 matching lines @@
 
 bool Extension::CanExecuteScriptOnPage(const GURL& page_url,
                                        const UserScript* script,
                                        std::string* error) const {
   base::AutoLock auto_lock(runtime_data_lock_);
   // The gallery is special-cased as a restricted URL for scripting to prevent
   // access to special JS bindings we expose to the gallery (and avoid things
   // like extensions removing the "report abuse" link).
   // TODO(erikkay): This seems like the wrong test.  Shouldn't we we testing
   // against the store app extent?
-  GURL store_url(extension_misc::GetWebstoreLaunchURL());
+  GURL store_url(extension_urls::GetWebstoreLaunchURL());
   if ((page_url.host() == store_url.host()) &&
       !CanExecuteScriptEverywhere() &&
       !CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kAllowScriptingGallery)) {
     if (error)
       *error = errors::kCannotScriptGallery;
     return false;
   }
 
   if (page_url.SchemeIs(chrome::kChromeUIScheme) &&
@@ skipping 61 matching lines @@
     return true;
 
   if (error) {
     *error = ExtensionErrorUtils::FormatErrorMessage(errors::kCannotAccessPage,
                                                      page_url.spec());
   }
   return false;
 }
 
 bool Extension::UpdatesFromGallery() const {
-  return update_url() == GalleryUpdateUrl(false) ||
-         update_url() == GalleryUpdateUrl(true);
+  return update_url() == extension_urls::GetWebstoreUpdateUrl(false) ||
+         update_url() == extension_urls::GetWebstoreUpdateUrl(true);
 }
 
 bool Extension::OverlapsWithOrigin(const GURL& origin) const {
   if (url() == origin)
     return true;
 
   if (web_extent().is_empty())
     return false;
 
   // Note: patterns and extents ignore port numbers.
@@ skipping 14 matching lines @@
   if (location() != Extension::INTERNAL) {
     // We have a non-standard location.
     return SYNC_TYPE_NONE;
   }
 
   // Disallow extensions with non-gallery auto-update URLs for now.
   //
   // TODO(akalin): Relax this restriction once we've put in UI to
   // approve synced extensions.
   if (!update_url().is_empty() &&
-      (update_url() != GalleryUpdateUrl(false)) &&
-      (update_url() != GalleryUpdateUrl(true))) {
+      (update_url() != extension_urls::GetWebstoreUpdateUrl(false)) &&
+      (update_url() != extension_urls::GetWebstoreUpdateUrl(true))) {
     return SYNC_TYPE_NONE;
   }
 
   // Disallow extensions with native code plugins.
   //
   // TODO(akalin): Relax this restriction once we've put in UI to
   // approve synced extensions.
   if (!plugins().empty()) {
     return SYNC_TYPE_NONE;
   }
 
   switch (GetType()) {
     case Extension::TYPE_EXTENSION:
       return SYNC_TYPE_EXTENSION;
 
     case Extension::TYPE_USER_SCRIPT:
       // We only want to sync user scripts with gallery update URLs.
-      if (update_url() == GalleryUpdateUrl(true) ||
-          update_url() == GalleryUpdateUrl(false))
+      if (update_url() == extension_urls::GetWebstoreUpdateUrl(true) ||
+          update_url() == extension_urls::GetWebstoreUpdateUrl(false))
         return SYNC_TYPE_EXTENSION;
       else
         return SYNC_TYPE_NONE;
 
     case Extension::TYPE_HOSTED_APP:
     case Extension::TYPE_PACKAGED_APP:
         return SYNC_TYPE_APP;
 
     default:
       return SYNC_TYPE_NONE;
@@ skipping 46 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}