Fixed sync regression for ephemeral apps

chrome/browser/extensions/app_sync_bundle.cc

 // Copyright (c) 2012 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/app_sync_bundle.h"
 
 #include "base/location.h"
 #include "chrome/browser/extensions/extension_sync_service.h"
+#include "chrome/browser/extensions/extension_util.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/sync_helper.h"
 #include "extensions/browser/app_sorting.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_set.h"
 #include "sync/api/sync_change_processor.h"
 #include "sync/api/sync_data.h"
 #include "sync/api/sync_error_factory.h"
 
 namespace extensions {
 
@@ skipping 115 matching lines @@
        ++i) {
     pending_apps.push_back(i->second);
   }
 
   return pending_apps;
 }
 
 void AppSyncBundle::GetAppSyncDataListHelper(
     const ExtensionSet& extensions,
     std::vector<AppSyncData>* sync_data_list) const {
+  Profile* profile = extension_sync_service_->profile();
+
   for (ExtensionSet::const_iterator it = extensions.begin();
        it != extensions.end(); ++it) {
     const Extension& extension = *it->get();
     // If we have pending app data for this app, then this
     // version is out of date.  We'll sync back the version we got from
     // sync.
-    if (IsSyncing() && sync_helper::IsSyncableApp(&extension) &&
+    if (IsSyncing() && util::ShouldSyncApp(&extension, profile) &&
         !HasPendingExtensionId(extension.id())) {
       sync_data_list->push_back(extension_sync_service_->GetAppSyncData(
           extension));
     }
   }
 }
 
 void AppSyncBundle::AddApp(const std::string& id) {
   synced_apps_.insert(id);
 }
 
 void AppSyncBundle::RemoveApp(const std::string& id) {
   synced_apps_.erase(id);
 }
 
 
 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) {
   pending_sync_data_.erase(id);
   synced_apps_.insert(id);
 }
 
 
 }  // namespace extensions