[Sync] Move ChangeRecord into its own file (change_record.{h,cc})

chrome/browser/sync/profile_sync_service_bookmark_unittest.cc

 // Copyright (c) 2011 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.
 
 // TODO(akalin): This file is basically just a unit test for
 // BookmarkChangeProcessor.  Write unit tests for
 // BookmarkModelAssociator separately.
 
 #include <stack>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/tracked.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
 #include "chrome/browser/sync/api/sync_error.h"
 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
+#include "chrome/browser/sync/internal_api/change_record.h"
 #include "chrome/browser/sync/internal_api/read_node.h"
 #include "chrome/browser/sync/internal_api/read_transaction.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
 #include "chrome/browser/sync/internal_api/write_node.h"
 #include "chrome/browser/sync/internal_api/write_transaction.h"
 #include "chrome/browser/sync/syncable/directory_manager.h"
 #include "chrome/browser/sync/test/engine/test_id_factory.h"
 #include "chrome/browser/sync/test/engine/test_user_share.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/browser_thread.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 113 matching lines @@
       EXPECT_EQ(predecessor.GetParentId(), parent.GetId());
       EXPECT_TRUE(node.InitByCreation(syncable::BOOKMARKS, parent,
                                       &predecessor));
     }
     EXPECT_EQ(node.GetPredecessorId(), predecessor_id);
     EXPECT_EQ(node.GetParentId(), parent_id);
     node.SetIsFolder(is_folder);
     node.SetTitle(title);
     if (!is_folder)
       node.SetURL(GURL(url));
-    sync_api::SyncManager::ChangeRecord record;
-    record.action = sync_api::SyncManager::ChangeRecord::ACTION_ADD;
+    sync_api::ChangeRecord record;
+    record.action = sync_api::ChangeRecord::ACTION_ADD;
     record.id = node.GetId();
     changes_.push_back(record);
     return node.GetId();
   }
 
   // Add a bookmark folder.
   int64 AddFolder(const std::wstring& title,
                   int64 parent_id,
                   int64 predecessor_id) {
     return Add(title, std::string(), true, parent_id, predecessor_id);
@@ skipping 15 matching lines @@
       EXPECT_TRUE(node.InitByIdLookup(id));
       EXPECT_FALSE(node.GetFirstChildId());
       node.Remove();
     }
     {
       // Verify the deletion.
       sync_api::ReadNode node(trans_);
       EXPECT_FALSE(node.InitByIdLookup(id));
     }
 
-    sync_api::SyncManager::ChangeRecord record;
-    record.action = sync_api::SyncManager::ChangeRecord::ACTION_DELETE;
+    sync_api::ChangeRecord record;
+    record.action = sync_api::ChangeRecord::ACTION_DELETE;
     record.id = id;
     // Deletions are always first in the changelist, but we can't actually do
     // WriteNode::Remove() on the node until its children are moved. So, as
     // a practical matter, users of FakeServerChange must move or delete
     // children before parents.  Thus, we must insert the deletion record
     // at the front of the vector.
     changes_.insert(changes_.begin(), record);
   }
 
   // Set a new title value, and return the old value.
@@ skipping 22 matching lines @@
       EXPECT_TRUE(predecessor.InitByIdLookup(predecessor_id));
       EXPECT_EQ(predecessor.GetParentId(), parent.GetId());
       EXPECT_TRUE(node.SetPosition(parent, &predecessor));
     }
     SetModified(id);
     return old_parent_id;
   }
 
   // Pass the fake change list to |service|.
   void ApplyPendingChanges(ChangeProcessor* processor) {
-    processor->ApplyChangesFromSyncModel(trans_,
-        changes_.size() ? &changes_[0] : NULL, changes_.size());
+    processor->ApplyChangesFromSyncModel(
+        trans_, sync_api::ImmutableChangeRecordList(&changes_));
   }
 
-  const std::vector<sync_api::SyncManager::ChangeRecord>& changes() {
+  const sync_api::ChangeRecordList& changes() {
     return changes_;
   }
 
  private:
   // Helper function to push an ACTION_UPDATE record onto the back
   // of the changelist.
   void SetModified(int64 id) {
     // Coalesce multi-property edits.
     if (!changes_.empty() && changes_.back().id == id &&
         changes_.back().action ==
-        sync_api::SyncManager::ChangeRecord::ACTION_UPDATE)
+        sync_api::ChangeRecord::ACTION_UPDATE)
       return;
-    sync_api::SyncManager::ChangeRecord record;
-    record.action = sync_api::SyncManager::ChangeRecord::ACTION_UPDATE;
+    sync_api::ChangeRecord record;
+    record.action = sync_api::ChangeRecord::ACTION_UPDATE;
     record.id = id;
     changes_.push_back(record);
   }
 
   // The transaction on which everything happens.
   sync_api::WriteTransaction *trans_;
 
   // The change list we construct.
-  std::vector<sync_api::SyncManager::ChangeRecord> changes_;
+  sync_api::ChangeRecordList changes_;
 };
 
 class MockUnrecoverableErrorHandler : public UnrecoverableErrorHandler {
  public:
   MOCK_METHOD2(OnUnrecoverableError,
                void(const tracked_objects::Location&, const std::string&));
 };
 
 class ProfileSyncServiceBookmarkTest : public testing::Test {
  protected:
@@ skipping 329 matching lines @@
   // u5 tests an empty-string title.
   std::string javascript_url(
       "javascript:(function(){var w=window.open(" \
       "'about:blank','gnotesWin','location=0,menubar=0," \
       "scrollbars=0,status=0,toolbar=0,width=300," \
       "height=300,resizable');});");
   adds.AddURL(L"", javascript_url, other_bookmarks_id(), 0);
   int64 u6 = adds.AddURL(L"Sync1", "http://www.syncable.edu/",
                          synced_bookmarks_id(), 0);
 
-  std::vector<sync_api::SyncManager::ChangeRecord>::const_iterator it;
+  sync_api::ChangeRecordList::const_iterator it;
   // The bookmark model shouldn't yet have seen any of the nodes of |adds|.
   for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
     ExpectBrowserNodeUnknown(it->id);
 
   adds.ApplyPendingChanges(change_processor_.get());
 
   // Make sure the bookmark model received all of the nodes in |adds|.
   for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
     ExpectBrowserNodeMatching(&trans, it->id);
   ExpectModelMatch(&trans);
@@ skipping 68 matching lines @@
   FakeServerChange adds(&trans);
   int64 f0 = other_bookmarks_id();                 // + other_node
   int64 f1 = adds.AddFolder(L"f1",      f0, 0);    //   + f1
   int64 f2 = adds.AddFolder(L"f2",      f1, 0);    //     + f2
   int64 u3 = adds.AddURL(   L"u3", url, f2, 0);    //       + u3    NOLINT
   int64 u4 = adds.AddURL(   L"u4", url, f2, u3);   //       + u4    NOLINT
   int64 u5 = adds.AddURL(   L"u5", url, f1, f2);   //     + u5      NOLINT
   int64 f6 = adds.AddFolder(L"f6",      f1, u5);   //     + f6
   int64 u7 = adds.AddURL(   L"u7", url, f0, f1);   //   + u7        NOLINT
 
-  std::vector<sync_api::SyncManager::ChangeRecord>::const_iterator it;
+  sync_api::ChangeRecordList::const_iterator it;
   // The bookmark model shouldn't yet have seen any of the nodes of |adds|.
   for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
     ExpectBrowserNodeUnknown(it->id);
 
   adds.ApplyPendingChanges(change_processor_.get());
 
   // Make sure the bookmark model received all of the nodes in |adds|.
   for (it = adds.changes().begin(); it != adds.changes().end(); ++it)
     ExpectBrowserNodeMatching(&trans, it->id);
   ExpectModelMatch(&trans);
@@ skipping 710 matching lines @@
   // Make sure we're back in sync.  In real life, the user would need
   // to reauthenticate before this happens, but in the test, authentication
   // is sidestepped.
   ExpectBookmarkModelMatchesTestData();
   ExpectModelMatch();
 }
 
 }  // namespace
 
 }  // namespace browser_sync