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

sync/api/sync_data_unittest.cc

 // Copyright 2014 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_data.h"
 
 #include <string>
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 35 matching lines @@
 
 TEST_F(SyncDataTest, NoArgCtor) {
   SyncData data;
   EXPECT_FALSE(data.IsValid());
 }
 
 TEST_F(SyncDataTest, CreateLocalDelete) {
   SyncData data = SyncData::CreateLocalDelete(kSyncTag, kDatatype);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
-  EXPECT_EQ(kSyncTag, data.GetTag());
+  EXPECT_EQ(kSyncTag, data.local().GetTag());
   EXPECT_EQ(kDatatype, data.GetDataType());
 }
 
 TEST_F(SyncDataTest, CreateLocalData) {
   specifics.mutable_preference();
   SyncData data =
       SyncData::CreateLocalData(kSyncTag, kNonUniqueTitle, specifics);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
-  EXPECT_EQ(kSyncTag, data.GetTag());
+  EXPECT_EQ(kSyncTag, data.local().GetTag());
   EXPECT_EQ(kDatatype, data.GetDataType());
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
 }
 
 TEST_F(SyncDataTest, CreateLocalDataWithAttachments) {
   specifics.mutable_preference();
   scoped_refptr<base::RefCountedMemory> bytes(new base::RefCountedString);
   AttachmentList attachments;
   attachments.push_back(Attachment::Create(bytes));
   attachments.push_back(Attachment::Create(bytes));
   attachments.push_back(Attachment::Create(bytes));
 
   SyncData data = SyncData::CreateLocalDataWithAttachments(
       kSyncTag, kNonUniqueTitle, specifics, attachments);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
-  EXPECT_EQ(kSyncTag, data.GetTag());
+  EXPECT_EQ(kSyncTag, data.local().GetTag());
   EXPECT_EQ(kDatatype, data.GetDataType());
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   AttachmentIdList attachment_ids = data.GetAttachmentIds();
   EXPECT_EQ(3U, attachment_ids.size());
-  EXPECT_EQ(3U, data.GetLocalAttachmentsForUpload().size());
+  EXPECT_EQ(3U, data.local().GetLocalAttachmentsForUpload().size());
 }
 
 TEST_F(SyncDataTest, CreateLocalDataWithAttachments_EmptyListOfAttachments) {
   specifics.mutable_preference();
   AttachmentList attachments;
   SyncData data = SyncData::CreateLocalDataWithAttachments(
       kSyncTag, kNonUniqueTitle, specifics, attachments);
   EXPECT_TRUE(data.IsValid());
   EXPECT_TRUE(data.IsLocal());
-  EXPECT_EQ(kSyncTag, data.GetTag());
+  EXPECT_EQ(kSyncTag, data.local().GetTag());
   EXPECT_EQ(kDatatype, data.GetDataType());
   EXPECT_EQ(kNonUniqueTitle, data.GetTitle());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   EXPECT_TRUE(data.GetAttachmentIds().empty());
-  EXPECT_TRUE(data.GetLocalAttachmentsForUpload().empty());
+  EXPECT_TRUE(data.local().GetLocalAttachmentsForUpload().empty());
 }
 
 TEST_F(SyncDataTest, CreateRemoteData) {
   specifics.mutable_preference();
   SyncData data = SyncData::CreateRemoteData(kId,
                                              specifics,
                                              kLastModifiedTime,
                                              AttachmentIdList(),
                                              attachment_service_proxy);
   EXPECT_TRUE(data.IsValid());
   EXPECT_FALSE(data.IsLocal());
-  EXPECT_EQ(kId, data.GetRemoteId());
-  EXPECT_EQ(kLastModifiedTime, data.GetRemoteModifiedTime());
+  EXPECT_EQ(kId, data.remote().GetRemoteId());
+  EXPECT_EQ(kLastModifiedTime, data.remote().GetRemoteModifiedTime());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
   EXPECT_TRUE(data.GetAttachmentIds().empty());
 }
 
 TEST_F(SyncDataTest, CreateRemoteData_WithoutAttachmentService) {
   specifics.mutable_preference();
   SyncData data = SyncData::CreateRemoteData(kId, specifics, kLastModifiedTime);
   EXPECT_TRUE(data.IsValid());
   EXPECT_FALSE(data.IsLocal());
-  EXPECT_EQ(kId, data.GetRemoteId());
-  EXPECT_EQ(kLastModifiedTime, data.GetRemoteModifiedTime());
+  EXPECT_EQ(kId, data.remote().GetRemoteId());
+  EXPECT_EQ(kLastModifiedTime, data.remote().GetRemoteModifiedTime());
   EXPECT_TRUE(data.GetSpecifics().has_preference());
 }
 
 // TODO(maniscalco): Add test cases that verify GetLocalAttachmentsForUpload and
 // DropAttachments calls are passed through to the underlying AttachmentService.
 
 }  // namespace
 
 }  // namespace syncer