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

sync/api/sync_change_unittest.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 "sync/api/sync_change.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
@@ skipping 12 matching lines @@
 
 typedef testing::Test SyncChangeTest;
 
 TEST_F(SyncChangeTest, LocalDelete) {
   SyncChange::SyncChangeType change_type = SyncChange::ACTION_DELETE;
   std::string tag = "client_tag";
   SyncChange e(FROM_HERE,
                change_type,
                SyncData::CreateLocalDelete(tag, PREFERENCES));
   EXPECT_EQ(change_type, e.change_type());
-  EXPECT_EQ(tag, e.sync_data().GetTag());
+  EXPECT_EQ(tag, SyncDataLocal(e.sync_data()).GetTag());
   EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType());
 }
 
 TEST_F(SyncChangeTest, LocalUpdate) {
   SyncChange::SyncChangeType change_type = SyncChange::ACTION_UPDATE;
   sync_pb::EntitySpecifics specifics;
   sync_pb::PreferenceSpecifics* pref_specifics = specifics.mutable_preference();
   pref_specifics->set_name("test");
   std::string tag = "client_tag";
   std::string title = "client_title";
   SyncChange e(FROM_HERE,
                change_type,
                SyncData::CreateLocalData(tag, title, specifics));
   EXPECT_EQ(change_type, e.change_type());
-  EXPECT_EQ(tag, e.sync_data().GetTag());
+  EXPECT_EQ(tag, SyncDataLocal(e.sync_data()).GetTag());
   EXPECT_EQ(title, e.sync_data().GetTitle());
   EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType());
   scoped_ptr<base::DictionaryValue> ref_spec(EntitySpecificsToValue(specifics));
   scoped_ptr<base::DictionaryValue> e_spec(EntitySpecificsToValue(
       e.sync_data().GetSpecifics()));
   EXPECT_TRUE(ref_spec->Equals(e_spec.get()));
 }
 
 TEST_F(SyncChangeTest, LocalAdd) {
   SyncChange::SyncChangeType change_type = SyncChange::ACTION_ADD;
   sync_pb::EntitySpecifics specifics;
   sync_pb::PreferenceSpecifics* pref_specifics = specifics.mutable_preference();
   pref_specifics->set_name("test");
   std::string tag = "client_tag";
   std::string title = "client_title";
   SyncChange e(FROM_HERE,
                change_type,
                SyncData::CreateLocalData(tag, title, specifics));
   EXPECT_EQ(change_type, e.change_type());
-  EXPECT_EQ(tag, e.sync_data().GetTag());
+  EXPECT_EQ(tag, SyncDataLocal(e.sync_data()).GetTag());
   EXPECT_EQ(title, e.sync_data().GetTitle());
   EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType());
   scoped_ptr<base::DictionaryValue> ref_spec(EntitySpecificsToValue(specifics));
   scoped_ptr<base::DictionaryValue> e_spec(EntitySpecificsToValue(
       e.sync_data().GetSpecifics()));
   EXPECT_TRUE(ref_spec->Equals(e_spec.get()));
 }
 
 TEST_F(SyncChangeTest, SyncerChanges) {
   SyncChangeList change_list;
@@ skipping 51 matching lines @@
   EXPECT_EQ(SyncChange::ACTION_DELETE, e.change_type());
   EXPECT_EQ(PREFERENCES, e.sync_data().GetDataType());
   ref_spec.reset(EntitySpecificsToValue(delete_specifics));
   e_spec.reset(EntitySpecificsToValue(e.sync_data().GetSpecifics()));
   EXPECT_TRUE(ref_spec->Equals(e_spec.get()));
 }
 
 }  // namespace
 
 }  // namespace syncer