Add a do_not_sync pref to ExtensionPrefs.

chrome/browser/extensions/extension_sync_service.cc

 // Copyright 2013 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_sync_service.h"
 
 #include <iterator>
 
 #include "base/basictypes.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 114 matching lines @@
   }
 }
 
 void ExtensionSyncService::SyncEnableExtension(
     const extensions::Extension& extension) {
 
   // Syncing may not have started yet, so handle pending enables.
   if (extensions::util::ShouldSyncApp(&extension, profile_))
     pending_app_enables_.OnExtensionEnabled(extension.id());
 
-  if (extensions::sync_helper::IsSyncableExtension(&extension))
+  if (extensions::util::ShouldSyncExtension(&extension, profile_))
     pending_extension_enables_.OnExtensionEnabled(extension.id());
 
   SyncExtensionChangeIfNeeded(extension);
 }
 
 void ExtensionSyncService::SyncDisableExtension(
     const extensions::Extension& extension) {
 
   // Syncing may not have started yet, so handle pending enables.
   if (extensions::util::ShouldSyncApp(&extension, profile_))
     pending_app_enables_.OnExtensionDisabled(extension.id());
 
-  if (extensions::sync_helper::IsSyncableExtension(&extension))
+  if (extensions::util::ShouldSyncExtension(&extension, profile_))
     pending_extension_enables_.OnExtensionDisabled(extension.id());
 
   SyncExtensionChangeIfNeeded(extension);
 }
 
 syncer::SyncMergeResult ExtensionSyncService::MergeDataAndStartSyncing(
     syncer::ModelType type,
     const syncer::SyncDataList& initial_sync_data,
     scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
     scoped_ptr<syncer::SyncErrorFactory> sync_error_factory) {
@@ skipping 308 matching lines @@
 
   // Set user settings.
   // If the extension has been disabled from sync, it may not have
   // been installed yet, so we don't know if the disable reason was a
   // permissions increase.  That will be updated once CheckPermissionsIncrease
   // is called for it.
   // However if the extension is marked as a remote install in sync, we know
   // what the disable reason is, so set it to that directly. Note that when
   // CheckPermissionsIncrease runs, it might still add permissions increase
   // as a disable reason for the extension.
-  if (extension_sync_data.enabled())
+  if (extension_sync_data.enabled()) {
     extension_service_->EnableExtension(id);
-  else if (!IsPendingEnable(id)) {
+  } else if (!IsPendingEnable(id)) {
     if (extension_sync_data.remote_install()) {
       extension_service_->DisableExtension(id,
                                            Extension::DISABLE_REMOTE_INSTALL);
     } else {
       extension_service_->DisableExtension(
           id, Extension::DISABLE_UNKNOWN_FROM_SYNC);
     }
   }
 
   // We need to cache some version information here because setting the
@@ skipping 49 matching lines @@
   return true;
 }
 
 void ExtensionSyncService::SyncExtensionChangeIfNeeded(
     const Extension& extension) {
   if (extensions::util::ShouldSyncApp(&extension, profile_)) {
     if (app_sync_bundle_.IsSyncing())
       app_sync_bundle_.SyncChangeIfNeeded(extension);
     else if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(syncer::APPS);
-  } else if (extensions::sync_helper::IsSyncableExtension(&extension)) {
+  } else if (extensions::util::ShouldSyncExtension(&extension, profile_)) {
     if (extension_sync_bundle_.IsSyncing())
       extension_sync_bundle_.SyncChangeIfNeeded(extension);
     else if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(syncer::EXTENSIONS);
   }
 }