diff options
author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 01:18:33 +0000 |
---|---|---|
committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-06 01:18:33 +0000 |
commit | 210c7bed9de215f7c6e14dcd72ab6544ed68b303 (patch) | |
tree | d82e48faed86f67d3ca431e12fdc93398bba939a /chrome/browser/sync | |
parent | b2e87adc76ba5044838c70bc6d97975c2ef09119 (diff) | |
download | chromium_src-210c7bed9de215f7c6e14dcd72ab6544ed68b303.zip chromium_src-210c7bed9de215f7c6e14dcd72ab6544ed68b303.tar.gz chromium_src-210c7bed9de215f7c6e14dcd72ab6544ed68b303.tar.bz2 |
sync: split SyncSessionSnapshot, SyncerStatus, ErrorCounters, and SyncSourceInfo out of session_state.
This is in preparation for moving the snapshot et al to internal_api/public.
BUG=131130
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10545010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@140687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync')
-rw-r--r-- | chrome/browser/sync/DEPS | 2 | ||||
-rw-r--r-- | chrome/browser/sync/backend_migrator.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/backend_migrator_unittest.cc | 1 | ||||
-rw-r--r-- | chrome/browser/sync/glue/DEPS | 2 | ||||
-rw-r--r-- | chrome/browser/sync/glue/generic_change_processor.cc | 1 | ||||
-rw-r--r-- | chrome/browser/sync/glue/sync_backend_host.h | 2 | ||||
-rw-r--r-- | chrome/browser/sync/profile_sync_service_harness.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/retry_verifier.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/sync_ui_util.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc | 2 | ||||
-rw-r--r-- | chrome/browser/sync/test_profile_sync_service.cc | 2 |
13 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/sync/DEPS b/chrome/browser/sync/DEPS index ee83fb2..4cd6d8b 100644 --- a/chrome/browser/sync/DEPS +++ b/chrome/browser/sync/DEPS @@ -6,7 +6,7 @@ include_rules = [ "+sync/internal_api", "+sync/js", "+sync/notifier/invalidation_state_tracker.h", - "+sync/sessions/session_state.h", + "+sync/sessions/sync_session_snapshot.h", "+sync/syncable/model_type.h", "+sync/syncable/model_type_payload_map.h", "+sync/syncable/model_type_test_util.h", diff --git a/chrome/browser/sync/backend_migrator.cc b/chrome/browser/sync/backend_migrator.cc index e8eb407..258d774 100644 --- a/chrome/browser/sync/backend_migrator.cc +++ b/chrome/browser/sync/backend_migrator.cc @@ -14,7 +14,7 @@ #include "sync/internal_api/configure_reason.h" #include "sync/internal_api/read_transaction.h" #include "sync/protocol/sync.pb.h" -#include "sync/sessions/session_state.h" +#include "sync/syncable/syncable.h" // TODO(tim): Bug 131130. using syncable::ModelTypeSet; diff --git a/chrome/browser/sync/backend_migrator_unittest.cc b/chrome/browser/sync/backend_migrator_unittest.cc index 0b17e26..aad46d9 100644 --- a/chrome/browser/sync/backend_migrator_unittest.cc +++ b/chrome/browser/sync/backend_migrator_unittest.cc @@ -12,7 +12,6 @@ #include "sync/internal_api/test_user_share.h" #include "sync/internal_api/write_transaction.h" #include "sync/protocol/sync.pb.h" -#include "sync/sessions/session_state.h" #include "sync/syncable/model_type_test_util.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/glue/DEPS b/chrome/browser/sync/glue/DEPS index 260f38a..c4d5763 100644 --- a/chrome/browser/sync/glue/DEPS +++ b/chrome/browser/sync/glue/DEPS @@ -18,7 +18,7 @@ include_rules = [ "+sync/notifier/sync_notifier_observer.h", "+sync/syncable/model_type.h", "+sync/syncable/model_type_payload_map.h", - "+sync/sessions/session_state.h", + "+sync/sessions/sync_session_snapshot.h", # Mocks/tests. "+sync/engine/syncapi_mock.h", diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index a38bf1c..32ee97d 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -17,6 +17,7 @@ #include "sync/internal_api/read_transaction.h" #include "sync/internal_api/write_node.h" #include "sync/internal_api/write_transaction.h" +#include "sync/syncable/syncable.h" // TODO(tim): Bug 123674. #include "sync/util/unrecoverable_error_handler.h" using content::BrowserThread; diff --git a/chrome/browser/sync/glue/sync_backend_host.h b/chrome/browser/sync/glue/sync_backend_host.h index e878554..83403ab0 100644 --- a/chrome/browser/sync/glue/sync_backend_host.h +++ b/chrome/browser/sync/glue/sync_backend_host.h @@ -26,7 +26,7 @@ #include "sync/notifier/sync_notifier_factory.h" #include "sync/protocol/encryption.pb.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" #include "sync/syncable/model_type.h" #include "sync/util/report_unrecoverable_error_function.h" #include "sync/util/unrecoverable_error_handler.h" diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index fb3f9f8..1d34963 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -26,7 +26,7 @@ #include "chrome/browser/sync/profile_sync_service_factory.h" #include "chrome/browser/sync/sync_ui_util.h" #include "chrome/common/chrome_switches.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" using browser_sync::sessions::SyncSessionSnapshot; diff --git a/chrome/browser/sync/retry_verifier.cc b/chrome/browser/sync/retry_verifier.cc index b7f395b..5d5113c 100644 --- a/chrome/browser/sync/retry_verifier.cc +++ b/chrome/browser/sync/retry_verifier.cc @@ -8,7 +8,7 @@ #include "base/logging.h" #include "sync/engine/polling_constants.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" namespace browser_sync { diff --git a/chrome/browser/sync/sync_ui_util.cc b/chrome/browser/sync/sync_ui_util.cc index 4242556..ce8e260 100644 --- a/chrome/browser/sync/sync_ui_util.cc +++ b/chrome/browser/sync/sync_ui_util.cc @@ -29,7 +29,7 @@ #include "grit/locale_settings.h" #include "sync/protocol/proto_enum_conversions.h" #include "sync/protocol/sync_protocol_error.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" #include "sync/syncable/model_type.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" diff --git a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc index 0bebb5d..a33dd4d 100644 --- a/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_bookmarks_sync_test.cc @@ -8,7 +8,7 @@ #include "chrome/browser/sync/test/integration/bookmarks_helper.h" #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" using bookmarks_helper::AddFolder; using bookmarks_helper::AddURL; diff --git a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc index fa66302..221b19d 100644 --- a/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_passwords_sync_test.cc @@ -7,7 +7,7 @@ #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" #include "sync/engine/model_safe_worker.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" using passwords_helper::AddLogin; using passwords_helper::AllProfilesContainSamePasswordForms; diff --git a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc index d409280..2a4b983 100644 --- a/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc +++ b/chrome/browser/sync/test/integration/two_client_sessions_sync_test.cc @@ -8,7 +8,7 @@ #include "chrome/browser/sync/test/integration/passwords_helper.h" #include "chrome/browser/sync/test/integration/sessions_helper.h" #include "chrome/browser/sync/test/integration/sync_test.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" using passwords_helper::SetDecryptionPassphrase; using passwords_helper::SetEncryptionPassphrase; diff --git a/chrome/browser/sync/test_profile_sync_service.cc b/chrome/browser/sync/test_profile_sync_service.cc index 60c881b..e0eca0a 100644 --- a/chrome/browser/sync/test_profile_sync_service.cc +++ b/chrome/browser/sync/test_profile_sync_service.cc @@ -14,7 +14,7 @@ #include "sync/internal_api/user_share.h" #include "sync/js/js_reply_handler.h" #include "sync/protocol/encryption.pb.h" -#include "sync/sessions/session_state.h" +#include "sync/sessions/sync_session_snapshot.h" #include "sync/syncable/syncable.h" using browser_sync::ModelSafeRoutingInfo; |