Separate SyncData methods into three groups, local, remote, and common.

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/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 {
 
 AppSyncBundle::AppSyncBundle(ExtensionSyncService* extension_sync_service)
     : extension_sync_service_(extension_sync_service) {}
 
 AppSyncBundle::~AppSyncBundle() {}
 
 void AppSyncBundle::SetupSync(
@@ skipping 28 matching lines @@
 
 void AppSyncBundle::ProcessDeletion(std::string extension_id,
                                     const syncer::SyncChange& sync_change) {
   RemoveApp(extension_id);
   sync_processor_->ProcessSyncChanges(FROM_HERE,
                                       syncer::SyncChangeList(1, sync_change));
 }
 
 syncer::SyncChange AppSyncBundle::CreateSyncChange(
     const syncer::SyncData& sync_data) {
-  if (HasExtensionId(sync_data.GetTag())) {
+  if (HasExtensionId(syncer::SyncDataLocal(sync_data).GetTag())) {
     return syncer::SyncChange(FROM_HERE,
                               syncer::SyncChange::ACTION_UPDATE,
                               sync_data);
   } else {
-    AddApp(sync_data.GetTag());
+    AddApp(syncer::SyncDataLocal(sync_data).GetTag());
     return syncer::SyncChange(FROM_HERE,
                               syncer::SyncChange::ACTION_ADD,
                               sync_data);
   }
 }
 
 syncer::SyncDataList AppSyncBundle::GetAllSyncData() const {
   std::vector<AppSyncData> app_sync_data =
       extension_sync_service_->GetAppSyncDataList();
   syncer::SyncDataList result(app_sync_data.size());
@@ skipping 84 matching lines @@
 }
 
 
 void AppSyncBundle::MarkPendingAppSynced(const std::string& id) {
   pending_sync_data_.erase(id);
   synced_apps_.insert(id);
 }
 
 
 }  // namespace extensions