summaryrefslogtreecommitdiffstats
path: root/sync/sessions/sync_session_unittest.cc
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 17:32:31 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-02 17:32:31 +0000
commitccf456dc41e2977ba48d4fc12ddfb25e867e0d8d (patch)
tree5e69073c593c2131ac877284aea0ec15dd5d87f1 /sync/sessions/sync_session_unittest.cc
parent8cc71d4c48873554d6fb6aeed64a71900dd1c9ad (diff)
downloadchromium_src-ccf456dc41e2977ba48d4fc12ddfb25e867e0d8d.zip
chromium_src-ccf456dc41e2977ba48d4fc12ddfb25e867e0d8d.tar.gz
chromium_src-ccf456dc41e2977ba48d4fc12ddfb25e867e0d8d.tar.bz2
Separate invalidator and sync client ID (part 1/2)
This change implements support for setting the sync client ID and invalidator client ID separately. The two IDs are managed separately and both of them are sent up to the server. This change includes some additional changes to support the transition, such as a new field in the about:sync UI. At this point, the IDs are not different. Both are initialized from the same source: the sync database. The work to store and manage the invalidator's ID separate from sync was begun in r180907 and will be finished in a separate commit. We will not be able to complete that work until the server supports separate IDs. BUG=124142 Review URL: https://chromiumcodereview.appspot.com/12256033 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185721 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sessions/sync_session_unittest.cc')
-rw-r--r--sync/sessions/sync_session_unittest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sync/sessions/sync_session_unittest.cc b/sync/sessions/sync_session_unittest.cc
index 008e893..bb4a3d5 100644
--- a/sync/sessions/sync_session_unittest.cc
+++ b/sync/sessions/sync_session_unittest.cc
@@ -64,7 +64,8 @@ class SyncSessionTest : public testing::Test,
std::vector<SyncEngineEventListener*>(),
NULL,
NULL,
- true /* enable keystore encryption */));
+ true, // enable keystore encryption
+ "fake_invalidator_client_id"));
context_->set_routing_info(routes_);
session_.reset(MakeSession());