Fixed sync regression for ephemeral apps

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 40 matching lines @@
   DCHECK_EQ(synced_info.app_url, loaded_info.app_url);
 
   if (!extension_service)
     return;
 
   // Use the old icons if they exist.
   synced_info.icons = loaded_info.icons;
   CreateOrUpdateBookmarkApp(extension_service.get(), synced_info);
 }
 
-bool ShouldSyncApp(const Extension* extension, Profile* profile) {
-  return extensions::sync_helper::IsSyncableApp(extension) &&
-      !extensions::util::IsEphemeralApp(extension->id(), profile);
-}
-
 }  // namespace
 
 ExtensionSyncService::ExtensionSyncService(Profile* profile,
                                            ExtensionPrefs* extension_prefs,
                                            ExtensionService* extension_service)
     : profile_(profile),
       extension_prefs_(extension_prefs),
       extension_service_(extension_service),
       app_sync_bundle_(this),
       extension_sync_bundle_(this),
@@ skipping 20 matching lines @@
 }
 
 syncer::SyncChange ExtensionSyncService::PrepareToSyncUninstallExtension(
     const extensions::Extension* extension, bool extensions_ready) {
   // Extract the data we need for sync now, but don't actually sync until we've
   // completed the uninstallation.
   // TODO(tim): If we get here and IsSyncing is false, this will cause
   // "back from the dead" style bugs, because sync will add-back the extension
   // that was uninstalled here when MergeDataAndStartSyncing is called.
   // See crbug.com/256795.
-  if (ShouldSyncApp(extension, profile_)) {
+  if (extensions::util::ShouldSyncApp(extension, profile_)) {
     if (app_sync_bundle_.IsSyncing())
       return app_sync_bundle_.CreateSyncChangeToDelete(extension);
     else if (extensions_ready && !flare_.is_null())
       flare_.Run(syncer::APPS);  // Tell sync to start ASAP.
   } else if (extensions::sync_helper::IsSyncableExtension(extension)) {
     if (extension_sync_bundle_.IsSyncing())
       return extension_sync_bundle_.CreateSyncChangeToDelete(extension);
     else if (extensions_ready && !flare_.is_null())
       flare_.Run(syncer::EXTENSIONS);  // Tell sync to start ASAP.
   }
@@ skipping 10 matching lines @@
   } else if (extension_sync_bundle_.HasExtensionId(extension_id) &&
              sync_change.sync_data().GetDataType() == syncer::EXTENSIONS) {
     extension_sync_bundle_.ProcessDeletion(extension_id, sync_change);
   }
 }
 
 void ExtensionSyncService::SyncEnableExtension(
     const extensions::Extension& extension) {
 
   // Syncing may not have started yet, so handle pending enables.
-  if (ShouldSyncApp(&extension, profile_))
+  if (extensions::util::ShouldSyncApp(&extension, profile_))
     pending_app_enables_.OnExtensionEnabled(extension.id());
 
   if (extensions::sync_helper::IsSyncableExtension(&extension))
     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 (ShouldSyncApp(&extension, profile_))
+  if (extensions::util::ShouldSyncApp(&extension, profile_))
     pending_app_enables_.OnExtensionDisabled(extension.id());
 
   if (extensions::sync_helper::IsSyncableExtension(&extension))
     pending_extension_enables_.OnExtensionDisabled(extension.id());
 
   SyncExtensionChangeIfNeeded(extension);
 }
 
 syncer::SyncMergeResult ExtensionSyncService::MergeDataAndStartSyncing(
     syncer::ModelType type,
@@ skipping 370 matching lines @@
     }
     // Track pending extensions so that we can return them in GetAllSyncData().
     return false;
   }
 
   return true;
 }
 
 void ExtensionSyncService::SyncExtensionChangeIfNeeded(
     const Extension& extension) {
-  if (ShouldSyncApp(&extension, profile_)) {
+  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)) {
     if (extension_sync_bundle_.IsSyncing())
       extension_sync_bundle_.SyncChangeIfNeeded(extension);
     else if (extension_service_->is_ready() && !flare_.is_null())
       flare_.Run(syncer::EXTENSIONS);
   }
 }