diff options
Diffstat (limited to 'chrome/browser/sync/syncable')
5 files changed, 23 insertions, 23 deletions
diff --git a/chrome/browser/sync/syncable/directory_backing_store.cc b/chrome/browser/sync/syncable/directory_backing_store.cc index 89b62c3..c409be4 100644 --- a/chrome/browser/sync/syncable/directory_backing_store.cc +++ b/chrome/browser/sync/syncable/directory_backing_store.cc @@ -18,15 +18,15 @@ #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/time.h" -#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/protocol/service_constants.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/syncable-inl.h" #include "chrome/browser/sync/syncable/syncable_columns.h" #include "chrome/browser/sync/util/time.h" #include "sql/connection.h" #include "sql/statement.h" #include "sql/transaction.h" +#include "sync/protocol/bookmark_specifics.pb.h" +#include "sync/protocol/sync.pb.h" using std::string; diff --git a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc index 14ae8c2..0863ce0 100644 --- a/chrome/browser/sync/syncable/directory_backing_store_unittest.cc +++ b/chrome/browser/sync/syncable/directory_backing_store_unittest.cc @@ -12,16 +12,16 @@ #include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" -#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/directory_backing_store.h" #include "chrome/browser/sync/syncable/on_disk_directory_backing_store.h" -#include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/syncable/syncable-inl.h" +#include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/test/test_directory_backing_store.h" #include "chrome/browser/sync/util/time.h" #include "sql/connection.h" #include "sql/statement.h" +#include "sync/protocol/bookmark_specifics.pb.h" +#include "sync/protocol/sync.pb.h" #include "testing/gtest/include/gtest/gtest-param-test.h" namespace syncable { diff --git a/chrome/browser/sync/syncable/model_type.cc b/chrome/browser/sync/syncable/model_type.cc index 311ac73..58385d3 100644 --- a/chrome/browser/sync/syncable/model_type.cc +++ b/chrome/browser/sync/syncable/model_type.cc @@ -7,21 +7,21 @@ #include "base/string_split.h" #include "base/values.h" #include "chrome/browser/sync/engine/syncproto.h" -#include "chrome/browser/sync/protocol/app_notification_specifics.pb.h" -#include "chrome/browser/sync/protocol/app_setting_specifics.pb.h" -#include "chrome/browser/sync/protocol/app_specifics.pb.h" -#include "chrome/browser/sync/protocol/autofill_specifics.pb.h" -#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" -#include "chrome/browser/sync/protocol/extension_setting_specifics.pb.h" -#include "chrome/browser/sync/protocol/extension_specifics.pb.h" -#include "chrome/browser/sync/protocol/nigori_specifics.pb.h" -#include "chrome/browser/sync/protocol/password_specifics.pb.h" -#include "chrome/browser/sync/protocol/preference_specifics.pb.h" -#include "chrome/browser/sync/protocol/search_engine_specifics.pb.h" -#include "chrome/browser/sync/protocol/session_specifics.pb.h" -#include "chrome/browser/sync/protocol/sync.pb.h" -#include "chrome/browser/sync/protocol/theme_specifics.pb.h" -#include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" +#include "sync/protocol/app_notification_specifics.pb.h" +#include "sync/protocol/app_setting_specifics.pb.h" +#include "sync/protocol/app_specifics.pb.h" +#include "sync/protocol/autofill_specifics.pb.h" +#include "sync/protocol/bookmark_specifics.pb.h" +#include "sync/protocol/extension_setting_specifics.pb.h" +#include "sync/protocol/extension_specifics.pb.h" +#include "sync/protocol/nigori_specifics.pb.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/preference_specifics.pb.h" +#include "sync/protocol/search_engine_specifics.pb.h" +#include "sync/protocol/session_specifics.pb.h" +#include "sync/protocol/sync.pb.h" +#include "sync/protocol/theme_specifics.pb.h" +#include "sync/protocol/typed_url_specifics.pb.h" namespace syncable { diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h index 96fb1bc..344e7e0 100644 --- a/chrome/browser/sync/syncable/syncable.h +++ b/chrome/browser/sync/syncable/syncable.h @@ -28,15 +28,15 @@ #include "base/time.h" #include "chrome/browser/sync/internal_api/includes/report_unrecoverable_error_function.h" #include "chrome/browser/sync/internal_api/includes/unrecoverable_error_handler.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/blob.h" #include "chrome/browser/sync/syncable/dir_open_result.h" -#include "chrome/browser/sync/syncable/syncable_id.h" #include "chrome/browser/sync/syncable/model_type.h" +#include "chrome/browser/sync/syncable/syncable_id.h" #include "chrome/browser/sync/util/cryptographer.h" #include "chrome/browser/sync/util/immutable.h" #include "chrome/browser/sync/util/time.h" #include "chrome/browser/sync/util/weak_handle.h" +#include "sync/protocol/sync.pb.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index 2ba255d..282fa7f 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -21,7 +21,6 @@ #include "base/values.h" #include "chrome/browser/sync/engine/syncproto.h" #include "chrome/browser/sync/internal_api/includes/test_unrecoverable_error_handler.h" -#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/syncable/directory_backing_store.h" #include "chrome/browser/sync/syncable/directory_change_delegate.h" #include "chrome/browser/sync/syncable/on_disk_directory_backing_store.h" @@ -30,6 +29,7 @@ #include "chrome/browser/sync/test/fake_encryptor.h" #include "chrome/browser/sync/test/null_directory_change_delegate.h" #include "chrome/browser/sync/test/null_transaction_observer.h" +#include "sync/protocol/bookmark_specifics.pb.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/sqlite/sqlite3.h" |