diff options
Diffstat (limited to 'chrome/browser/sync/internal_api')
10 files changed, 37 insertions, 37 deletions
diff --git a/chrome/browser/sync/internal_api/base_node.cc b/chrome/browser/sync/internal_api/base_node.cc index 9098105..7ce674a 100644 --- a/chrome/browser/sync/internal_api/base_node.cc +++ b/chrome/browser/sync/internal_api/base_node.cc @@ -11,18 +11,18 @@ #include "base/values.h" #include "chrome/browser/sync/engine/syncapi_internal.h" #include "chrome/browser/sync/internal_api/base_transaction.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_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/session_specifics.pb.h" -#include "chrome/browser/sync/protocol/theme_specifics.pb.h" -#include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/syncable/syncable_id.h" #include "chrome/browser/sync/util/time.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_specifics.pb.h" +#include "sync/protocol/nigori_specifics.pb.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/session_specifics.pb.h" +#include "sync/protocol/theme_specifics.pb.h" +#include "sync/protocol/typed_url_specifics.pb.h" using syncable::SPECIFICS; using sync_pb::AutofillProfileSpecifics; diff --git a/chrome/browser/sync/internal_api/base_node.h b/chrome/browser/sync/internal_api/base_node.h index 5890955..4159fde 100644 --- a/chrome/browser/sync/internal_api/base_node.h +++ b/chrome/browser/sync/internal_api/base_node.h @@ -12,9 +12,9 @@ #include "base/basictypes.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/model_type.h" #include "googleurl/src/gurl.h" +#include "sync/protocol/sync.pb.h" // Forward declarations of internal class types so that sync API objects // may have opaque pointers to these types. diff --git a/chrome/browser/sync/internal_api/change_record.h b/chrome/browser/sync/internal_api/change_record.h index 6a94564..45dc7db 100644 --- a/chrome/browser/sync/internal_api/change_record.h +++ b/chrome/browser/sync/internal_api/change_record.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. @@ -9,9 +9,9 @@ #include "base/basictypes.h" #include "base/memory/linked_ptr.h" -#include "chrome/browser/sync/protocol/password_specifics.pb.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/util/immutable.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/sync.pb.h" namespace base { class DictionaryValue; diff --git a/chrome/browser/sync/internal_api/change_record_unittest.cc b/chrome/browser/sync/internal_api/change_record_unittest.cc index edb2ae1..00105147 100644 --- a/chrome/browser/sync/internal_api/change_record_unittest.cc +++ b/chrome/browser/sync/internal_api/change_record_unittest.cc @@ -8,9 +8,9 @@ #include "base/string_number_conversions.h" #include "base/test/values_test_util.h" #include "base/values.h" -#include "chrome/browser/sync/protocol/extension_specifics.pb.h" #include "chrome/browser/sync/protocol/proto_value_conversions.h" -#include "chrome/browser/sync/protocol/sync.pb.h" +#include "sync/protocol/extension_specifics.pb.h" +#include "sync/protocol/sync.pb.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/internal_api/change_reorder_buffer.h b/chrome/browser/sync/internal_api/change_reorder_buffer.h index 5bbdccf..f474dd5 100644 --- a/chrome/browser/sync/internal_api/change_reorder_buffer.h +++ b/chrome/browser/sync/internal_api/change_reorder_buffer.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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. // @@ -17,7 +17,7 @@ #include "base/memory/linked_ptr.h" #include "chrome/browser/sync/internal_api/base_transaction.h" #include "chrome/browser/sync/internal_api/change_record.h" -#include "chrome/browser/sync/protocol/sync.pb.h" +#include "sync/protocol/sync.pb.h" namespace sync_api { diff --git a/chrome/browser/sync/internal_api/debug_info_event_listener.h b/chrome/browser/sync/internal_api/debug_info_event_listener.h index f6c90ae..c1f0ce7 100644 --- a/chrome/browser/sync/internal_api/debug_info_event_listener.h +++ b/chrome/browser/sync/internal_api/debug_info_event_listener.h @@ -11,10 +11,10 @@ #include "base/compiler_specific.h" #include "chrome/browser/sync/internal_api/sync_manager.h" #include "chrome/browser/sync/js/js_backend.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/sessions/debug_info_getter.h" #include "chrome/browser/sync/sessions/session_state.h" #include "chrome/browser/sync/util/weak_handle.h" +#include "sync/protocol/sync.pb.h" namespace sync_api { diff --git a/chrome/browser/sync/internal_api/read_node_mock.cc b/chrome/browser/sync/internal_api/read_node_mock.cc index 64007b5..bbe23ea 100644 --- a/chrome/browser/sync/internal_api/read_node_mock.cc +++ b/chrome/browser/sync/internal_api/read_node_mock.cc @@ -1,10 +1,10 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// 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 "chrome/browser/sync/internal_api/read_node_mock.h" -#include "chrome/browser/sync/protocol/autofill_specifics.pb.h" +#include "sync/protocol/autofill_specifics.pb.h" ReadNodeMock::ReadNodeMock() {} diff --git a/chrome/browser/sync/internal_api/sync_manager.cc b/chrome/browser/sync/internal_api/sync_manager.cc index 73eeaee..03772b4 100644 --- a/chrome/browser/sync/internal_api/sync_manager.cc +++ b/chrome/browser/sync/internal_api/sync_manager.cc @@ -20,9 +20,9 @@ #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/engine/nigori_util.h" #include "chrome/browser/sync/engine/polling_constants.h" +#include "chrome/browser/sync/engine/sync_scheduler.h" #include "chrome/browser/sync/engine/syncapi_internal.h" #include "chrome/browser/sync/engine/syncer_types.h" -#include "chrome/browser/sync/engine/sync_scheduler.h" #include "chrome/browser/sync/internal_api/base_node.h" #include "chrome/browser/sync/internal_api/change_reorder_buffer.h" #include "chrome/browser/sync/internal_api/configure_reason.h" @@ -42,9 +42,7 @@ #include "chrome/browser/sync/js/js_sync_manager_observer.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/browser/sync/notifier/sync_notifier_observer.h" -#include "chrome/browser/sync/protocol/encryption.pb.h" #include "chrome/browser/sync/protocol/proto_value_conversions.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/directory_change_delegate.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/syncable/model_type_payload_map.h" @@ -53,6 +51,8 @@ #include "chrome/browser/sync/util/get_session_name.h" #include "chrome/browser/sync/util/time.h" #include "net/base/network_change_notifier.h" +#include "sync/protocol/encryption.pb.h" +#include "sync/protocol/sync.pb.h" using base::TimeDelta; using browser_sync::AllStatus; diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc index 1d66b49..94214d2 100644 --- a/chrome/browser/sync/internal_api/syncapi_unittest.cc +++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc @@ -43,13 +43,7 @@ #include "chrome/browser/sync/js/js_test_util.h" #include "chrome/browser/sync/notifier/sync_notifier.h" #include "chrome/browser/sync/notifier/sync_notifier_observer.h" -#include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" -#include "chrome/browser/sync/protocol/encryption.pb.h" -#include "chrome/browser/sync/protocol/extension_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/proto_value_conversions.h" -#include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/sessions/sync_session.h" #include "chrome/browser/sync/syncable/model_type_test_util.h" #include "chrome/browser/sync/syncable/syncable.h" @@ -60,6 +54,12 @@ #include "chrome/browser/sync/util/cryptographer.h" #include "chrome/browser/sync/util/extensions_activity_monitor.h" #include "chrome/browser/sync/util/time.h" +#include "sync/protocol/bookmark_specifics.pb.h" +#include "sync/protocol/encryption.pb.h" +#include "sync/protocol/extension_specifics.pb.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/preference_specifics.pb.h" +#include "sync/protocol/sync.pb.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/internal_api/write_node.cc b/chrome/browser/sync/internal_api/write_node.cc index d64639d..8bfcc86 100644 --- a/chrome/browser/sync/internal_api/write_node.cc +++ b/chrome/browser/sync/internal_api/write_node.cc @@ -11,16 +11,16 @@ #include "chrome/browser/sync/engine/syncapi_internal.h" #include "chrome/browser/sync/internal_api/base_transaction.h" #include "chrome/browser/sync/internal_api/write_transaction.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_specifics.pb.h" -#include "chrome/browser/sync/protocol/password_specifics.pb.h" -#include "chrome/browser/sync/protocol/session_specifics.pb.h" -#include "chrome/browser/sync/protocol/theme_specifics.pb.h" -#include "chrome/browser/sync/protocol/typed_url_specifics.pb.h" #include "chrome/browser/sync/syncable/syncable.h" #include "chrome/browser/sync/util/cryptographer.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_specifics.pb.h" +#include "sync/protocol/password_specifics.pb.h" +#include "sync/protocol/session_specifics.pb.h" +#include "sync/protocol/theme_specifics.pb.h" +#include "sync/protocol/typed_url_specifics.pb.h" using browser_sync::Cryptographer; using std::string; |