diff options
author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:52:44 +0000 |
---|---|---|
committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-22 21:52:44 +0000 |
commit | ab44ef0ed3524ac26a5486d0e071c689f98d7087 (patch) | |
tree | eb8f189e05e1d3087822785127399e5961fe4a3a /chrome/test | |
parent | 3dec196bbf9945f96ab4a30802f238cda8518087 (diff) | |
download | chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.zip chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.tar.gz chromium_src-ab44ef0ed3524ac26a5486d0e071c689f98d7087.tar.bz2 |
[Sync] Move TypePayloadMap into its own file
Also rename it to ModelTypePayloadMap.
BUG=None
TEST=
Review URL: http://codereview.chromium.org/6718024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79046 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r-- | chrome/test/sync/engine/mock_connection_manager.h | 8 | ||||
-rw-r--r-- | chrome/test/sync/engine/syncer_command_test.h | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/chrome/test/sync/engine/mock_connection_manager.h b/chrome/test/sync/engine/mock_connection_manager.h index 245c005..8fc9767 100644 --- a/chrome/test/sync/engine/mock_connection_manager.h +++ b/chrome/test/sync/engine/mock_connection_manager.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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,9 +17,9 @@ #include "base/scoped_vector.h" #include "chrome/browser/sync/engine/net/server_connection_manager.h" #include "chrome/browser/sync/protocol/sync.pb.h" -#include "chrome/browser/sync/sessions/session_state.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/model_type.h" +#include "chrome/browser/sync/syncable/model_type_payload_map.h" namespace syncable { class DirectoryManager; @@ -215,7 +215,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { } void ExpectGetUpdatesRequestPayloads( - const browser_sync::sessions::TypePayloadMap& payloads) { + const syncable::ModelTypePayloadMap& payloads) { expected_payloads_ = payloads; } @@ -350,7 +350,7 @@ class MockConnectionManager : public browser_sync::ServerConnectionManager { std::bitset<syncable::MODEL_TYPE_COUNT> expected_filter_; - browser_sync::sessions::TypePayloadMap expected_payloads_; + syncable::ModelTypePayloadMap expected_payloads_; int num_get_updates_requests_; diff --git a/chrome/test/sync/engine/syncer_command_test.h b/chrome/test/sync/engine/syncer_command_test.h index 6225f0f..34da231 100644 --- a/chrome/test/sync/engine/syncer_command_test.h +++ b/chrome/test/sync/engine/syncer_command_test.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -87,9 +87,9 @@ class SyncerCommandTestWithParam : public testing::TestWithParam<T>, // Lazily create a session requesting all datatypes with no payload. sessions::SyncSession* session() { - sessions::TypePayloadMap types = - sessions::MakeTypePayloadMapFromRoutingInfo(routing_info_, - std::string()); + syncable::ModelTypePayloadMap types = + syncable::ModelTypePayloadMapFromRoutingInfo(routing_info_, + std::string()); return session(sessions::SyncSourceInfo(types)); } |