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

components/sync/syncable/parent_child_index.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/syncable/parent_child_index.h"
+#include "components/sync/syncable/parent_child_index.h"
 
 #include "base/stl_util.h"
 
-#include "sync/syncable/entry_kernel.h"
-#include "sync/syncable/syncable_id.h"
+#include "components/sync/syncable/entry_kernel.h"
+#include "components/sync/syncable/syncable_id.h"
 
 namespace syncer {
 namespace syncable {
 
 bool ChildComparator::operator()(const EntryKernel* a,
                                  const EntryKernel* b) const {
   const UniquePosition& a_pos = a->ref(UNIQUE_POSITION);
   const UniquePosition& b_pos = b->ref(UNIQUE_POSITION);
 
   if (a_pos.IsValid() && b_pos.IsValid()) {
@@ skipping 132 matching lines @@
   // Erase the entry from the child set.
   siblings->erase(j);
   // If the set is now empty and isn't shareable with |type_root_child_sets_|,
   // erase it from the map.
   if (siblings->empty() && should_erase) {
     delete siblings;
     parent_children_map_.erase(it);
   }
 }
 
-bool ParentChildIndex::Contains(EntryKernel *e) const {
+bool ParentChildIndex::Contains(EntryKernel* e) const {
   const OrderedChildSet* siblings = GetChildSet(e);
   return siblings && siblings->count(e) > 0;
 }
 
 const OrderedChildSet* ParentChildIndex::GetChildren(const Id& id) const {
   DCHECK(!id.IsNull());
 
   ParentChildrenMap::const_iterator parent = parent_children_map_.find(id);
   if (parent == parent_children_map_.end()) {
     return nullptr;
@@ skipping 56 matching lines @@
     type_root_child_sets_[model_type] = new OrderedChildSet();
   return type_root_child_sets_[model_type];
 }
 
 const Id& ParentChildIndex::GetModelTypeRootId(ModelType model_type) const {
   return model_type_root_ids_[model_type];
 }
 
 }  // namespace syncable
 }  // namespace syncer