[Sync] //components/sync internal changes [DO NOT SUBMIT]

components/sync/syncable/parent_child_index_unittest.cc

 // Copyright (c) 2013 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/syncable/parent_child_index.h"
+#include "components/sync/syncable/parent_child_index.h"
 
 #include <list>
 #include <string>
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "sync/syncable/entry_kernel.h"
-#include "sync/syncable/syncable_util.h"
+#include "components/sync/syncable/entry_kernel.h"
+#include "components/sync/syncable/syncable_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 namespace syncable {
 
 namespace {
 
 static const std::string kCacheGuid = "8HhNIHlEOCGQbIAALr9QEg==";
 
 }  // namespace
@@ skipping 62 matching lines @@
   EntryKernel* MakeBookmark(int n, int pos, bool is_dir) {
     // Mimics a regular bookmark or folder.
     EntryKernel* bm = new EntryKernel();
     bm->put(META_HANDLE, n);
     bm->put(BASE_VERSION, 10);
     bm->put(SERVER_VERSION, 10);
     bm->put(IS_DIR, is_dir);
     bm->put(ID, GetBookmarkId(n));
     bm->put(PARENT_ID, GetBookmarkRootId());
 
-    bm->put(UNIQUE_BOOKMARK_TAG,
-            syncable::GenerateSyncableBookmarkHash(kCacheGuid,
-                                                   bm->ref(ID).GetServerId()));
+    bm->put(UNIQUE_BOOKMARK_TAG, syncable::GenerateSyncableBookmarkHash(
+                                     kCacheGuid, bm->ref(ID).GetServerId()));
 
     UniquePosition unique_pos =
         UniquePosition::FromInt64(pos, bm->ref(UNIQUE_BOOKMARK_TAG));
     bm->put(UNIQUE_POSITION, unique_pos);
     bm->put(SERVER_UNIQUE_POSITION, unique_pos);
 
     owned_entry_kernels_.push_back(bm);
     return bm;
   }
 
@@ skipping 356 matching lines @@
 
   // The index should still be able to associate Preferences entries
   // with the root.
   const OrderedChildSet* children = index_.GetChildren(type_root_id);
   ASSERT_TRUE(children);
   EXPECT_EQ(2UL, children->size());
 }
 
 }  // namespace syncable
 }  // namespace syncer
-