[sync] Componentize sync: Part 5: Eliminate filename collisions in sync.gyp

sync/internal_api/change_reorder_buffer.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 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/internal_api/change_reorder_buffer.h"
 
 #include <limits>
 #include <queue>
 #include <set>
 #include <utility>  // for pair<>
 
 #include "sync/internal_api/public/base/model_type.h"
 #include "sync/internal_api/public/read_node.h"
-#include "sync/syncable/base_transaction.h"
 #include "sync/syncable/directory.h"
 #include "sync/syncable/entry.h"
+#include "sync/syncable/syncable_base_transaction.h"
 
 using std::numeric_limits;
 using std::pair;
 using std::queue;
 using std::set;
 
 namespace syncer {
 
 // Traversal provides a way to collect a set of nodes from the syncable
 // directory structure and then traverse them, along with any intermediate
@@ skipping 192 matching lines @@
         id = child.Get(syncable::NEXT_ID);
       }
     }
   }
 
   *changes = ImmutableChangeRecordList(&changelist);
   return true;
 }
 
 }  // namespace syncer