| Index: chrome/browser/sync/syncable/syncable.cc
|
| diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
|
| index cf30b99af14e15d35b3115702d14afb807870a8f..4ece5bd824ca5a40ba17d0bf07229bbfe8aebb2c 100644
|
| --- a/chrome/browser/sync/syncable/syncable.cc
|
| +++ b/chrome/browser/sync/syncable/syncable.cc
|
| @@ -27,14 +27,14 @@
|
| #include <set>
|
| #include <string>
|
|
|
| -#include "base/hash_tables.h"
|
| #include "base/file_util.h"
|
| +#include "base/hash_tables.h"
|
| #include "base/logging.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/perftimer.h"
|
| +#include "base/stl_util.h"
|
| #include "base/string_number_conversions.h"
|
| #include "base/string_util.h"
|
| -#include "base/stl_util.h"
|
| #include "base/time.h"
|
| #include "base/tracked.h"
|
| #include "base/utf_string_conversions.h"
|
| @@ -45,10 +45,10 @@
|
| #include "chrome/browser/sync/syncable/directory_change_delegate.h"
|
| #include "chrome/browser/sync/syncable/directory_manager.h"
|
| #include "chrome/browser/sync/syncable/model_type.h"
|
| -#include "chrome/browser/sync/syncable/syncable-inl.h"
|
| #include "chrome/browser/sync/syncable/syncable_changes_version.h"
|
| #include "chrome/browser/sync/syncable/syncable_columns.h"
|
| #include "chrome/browser/sync/syncable/syncable_enum_conversions.h"
|
| +#include "chrome/browser/sync/syncable/syncable-inl.h"
|
| #include "chrome/browser/sync/syncable/transaction_observer.h"
|
| #include "chrome/browser/sync/util/logging.h"
|
| #include "net/base/escape.h"
|
|
|