diff options
Diffstat (limited to 'chrome/browser/sync/syncable')
| -rw-r--r-- | chrome/browser/sync/syncable/DEPS | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/syncable/model_type_payload_map.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/sync/syncable/syncable.cc | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/sync/syncable/DEPS b/chrome/browser/sync/syncable/DEPS index 710d381..032cd30 100644 --- a/chrome/browser/sync/syncable/DEPS +++ b/chrome/browser/sync/syncable/DEPS @@ -16,5 +16,7 @@ include_rules = [ "+chrome/common/random.h", "+chrome/common/sqlite_utils.h", + + "-chrome/browser/sync/internal_api", ] diff --git a/chrome/browser/sync/syncable/model_type_payload_map.cc b/chrome/browser/sync/syncable/model_type_payload_map.cc index 2507a2b..288d8ff 100644 --- a/chrome/browser/sync/syncable/model_type_payload_map.cc +++ b/chrome/browser/sync/syncable/model_type_payload_map.cc @@ -7,7 +7,7 @@ #include "chrome/browser/sync/engine/model_safe_worker.h" #include "base/json/json_writer.h" -#include "base/scoped_ptr.h" +#include "base/memory/scoped_ptr.h" #include "base/values.h" using browser_sync::ModelSafeRoutingInfo; diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index cf30b99..4ece5bd 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" |