Massive refactoring of extensions sync code

chrome/browser/extensions/extensions_service.cc

 // Copyright (c) 2010 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/extensions_service.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/histogram.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/extensions/extension_history_api.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_updater.h"
 #include "chrome/browser/extensions/external_extension_provider.h"
 #include "chrome/browser/extensions/external_pref_extension_provider.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url_model.h"
+#include "chrome/browser/sync/glue/extension_sync_traits.h"
 #include "chrome/browser/sync/glue/extension_util.h"
 #include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_type.h"
@@ skipping 905 matching lines @@
           << "Not installing pending extension " << extension->id()
           << " with is_theme = " << extension->is_theme()
           << "; expected is_theme = " << pending_extension_info.is_theme;
       // Delete the extension directory since we're not going to
       // load it.
       ChromeThread::PostTask(
           ChromeThread::FILE, FROM_HERE,
           NewRunnableFunction(&DeleteFileHelper, extension->path(), true));
       return;
     }
+    // TODO(akalin): When we do apps sync, we have to work with its
+    // traits, too.
+    const browser_sync::ExtensionSyncTraits extension_sync_traits =
+        browser_sync::GetExtensionSyncTraits();
+    // If an extension is a theme, we bypass the valid/syncable check
+    // as themes are harmless.
     if (!extension->is_theme() &&
-        !browser_sync::IsExtensionSyncable(*extension)) {
+        !browser_sync::IsExtensionValidAndSyncable(
+            *extension, extension_sync_traits.allowed_extension_types)) {
       // We're an extension installed via sync that is unsyncable,
       // i.e. we may have been syncable previously.  We block these
       // installs.  We'll have to update the clause above if we decide
       // to sync other extension-like things, like apps or user
       // scripts.
       //
       // Note that this creates a small window where a user who tries
       // to download/install an extension that is simultaneously
       // installed via sync (and blocked) will find his download
       // blocked.
       //
       // TODO(akalin): Remove this check once we've put in UI to
       // approve synced extensions.
       LOG(WARNING)
-          << "Not installing non-syncable extension " << extension->id();
+          << "Not installing invalid or unsyncable extension "
+          << extension->id();
       // Delete the extension directory since we're not going to
       // load it.
       ChromeThread::PostTask(
           ChromeThread::FILE, FROM_HERE,
           NewRunnableFunction(&DeleteFileHelper, extension->path(), true));
       return;
     }
     if (pending_extension_info.is_theme) {
       DCHECK(pending_extension_info.enable_on_install);
       initial_state = Extension::ENABLED;
@@ skipping 397 matching lines @@
   // Finish installing on UI thread.
   ChromeThread::PostTask(
       ChromeThread::UI, FROM_HERE,
       NewRunnableMethod(
           frontend_,
           &ExtensionsService::ContinueLoadAllExtensions,
           extensions_to_reload,
           start_time,
           true));
 }