Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Side by Side Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 263273002: Add a ClientAction used by SyncRollbackManager to notify PSS that rollback is (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | sync/internal_api/sync_rollback_manager.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/sync/test/integration/sync_test.h" 5 #include "chrome/browser/sync/test/integration/sync_test.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 958 matching lines...) Expand 10 before | Expand all | Expand 10 after
969 case syncer::CLEAR_USER_DATA_AND_RESYNC: 969 case syncer::CLEAR_USER_DATA_AND_RESYNC:
970 return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC; 970 return sync_pb::SyncEnums::CLEAR_USER_DATA_AND_RESYNC;
971 case syncer::ENABLE_SYNC_ON_ACCOUNT: 971 case syncer::ENABLE_SYNC_ON_ACCOUNT:
972 return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT; 972 return sync_pb::SyncEnums::ENABLE_SYNC_ON_ACCOUNT;
973 case syncer::STOP_AND_RESTART_SYNC: 973 case syncer::STOP_AND_RESTART_SYNC:
974 return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC; 974 return sync_pb::SyncEnums::STOP_AND_RESTART_SYNC;
975 case syncer::DISABLE_SYNC_ON_CLIENT: 975 case syncer::DISABLE_SYNC_ON_CLIENT:
976 return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT; 976 return sync_pb::SyncEnums::DISABLE_SYNC_ON_CLIENT;
977 case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT: 977 case syncer::STOP_SYNC_FOR_DISABLED_ACCOUNT:
978 case syncer::DISABLE_SYNC_AND_ROLLBACK: 978 case syncer::DISABLE_SYNC_AND_ROLLBACK:
979 case syncer::ROLLBACK_DONE:
979 NOTREACHED(); // No corresponding proto action for these. Shouldn't 980 NOTREACHED(); // No corresponding proto action for these. Shouldn't
980 // test. 981 // test.
981 return sync_pb::SyncEnums::UNKNOWN_ACTION; 982 return sync_pb::SyncEnums::UNKNOWN_ACTION;
982 case syncer::UNKNOWN_ACTION: 983 case syncer::UNKNOWN_ACTION:
983 return sync_pb::SyncEnums::UNKNOWN_ACTION; 984 return sync_pb::SyncEnums::UNKNOWN_ACTION;
984 } 985 }
985 return sync_pb::SyncEnums::UNKNOWN_ACTION; 986 return sync_pb::SyncEnums::UNKNOWN_ACTION;
986 } 987 }
987 988
988 } // namespace 989 } // namespace
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
1027 BrowserThread::PostTask( 1028 BrowserThread::PostTask(
1028 BrowserThread::IO, FROM_HERE, 1029 BrowserThread::IO, FROM_HERE,
1029 base::Bind(&SetProxyConfigCallback, &done, 1030 base::Bind(&SetProxyConfigCallback, &done,
1030 make_scoped_refptr(context_getter), proxy_config)); 1031 make_scoped_refptr(context_getter), proxy_config));
1031 done.Wait(); 1032 done.Wait();
1032 } 1033 }
1033 1034
1034 fake_server::FakeServer* SyncTest::GetFakeServer() const { 1035 fake_server::FakeServer* SyncTest::GetFakeServer() const {
1035 return fake_server_.get(); 1036 return fake_server_.get();
1036 } 1037 }
OLDNEW
« no previous file with comments | « no previous file | sync/internal_api/sync_rollback_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698