Revert 97482 - Apps/Extensions Sync refactoring -- delete most of the old glue, implement new syn...

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 264 matching lines @@
   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
   // deterministicly choose a location.
   CHECK(loc1_rank != loc2_rank);
 
-  // Highest rank has highest priority.
+  // Lowest rank has highest priority.
   return (loc1_rank > loc2_rank ? loc1 : loc2 );
 }
 
 void Extension::OverrideLaunchUrl(const GURL& override_url) {
   GURL new_url(override_url);
   if (!new_url.is_valid()) {
     LOG(WARNING) << "Invalid override url given for " << name();
   } else {
     if (new_url.has_port()) {
       LOG(WARNING) << "Override URL passed for " << name()
@@ skipping 2518 matching lines @@
     return false;
   origin_only_pattern.SetHost(origin.host());
   origin_only_pattern.SetPath("/*");
 
   URLPatternSet origin_only_pattern_list;
   origin_only_pattern_list.AddPattern(origin_only_pattern);
 
   return web_extent().OverlapsWith(origin_only_pattern_list);
 }
 
-Extension::SyncType Extension::GetSyncType() const {
-  // TODO(akalin): Figure out if we need to allow some other types.
-  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))) {
-    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))
-        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;
-  }
-}
-
 ExtensionInfo::ExtensionInfo(const DictionaryValue* manifest,
                              const std::string& id,
                              const FilePath& path,
                              Extension::Location location)
     : extension_id(id),
       extension_path(path),
       extension_location(location) {
   if (manifest)
     extension_manifest.reset(manifest->DeepCopy());
 }
@@ skipping 33 matching lines @@
     already_disabled(false),
     extension(extension) {}
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const ExtensionPermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}