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

Side by Side Diff: sync/engine/syncer_proto_util_unittest.cc

Issue 9699057: [Sync] Move 'sync' target to sync/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Tim's comments Created 8 years, 9 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 | « sync/engine/syncer_proto_util.cc ('k') | sync/engine/syncer_types.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/engine/syncer_proto_util.h" 5 #include "sync/engine/syncer_proto_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/message_loop.h" 11 #include "base/message_loop.h"
12 #include "base/time.h" 12 #include "base/time.h"
13 #include "chrome/browser/sync/engine/syncproto.h" 13 #include "sync/engine/syncproto.h"
14 #include "chrome/browser/sync/sessions/session_state.h" 14 #include "sync/sessions/session_state.h"
15 #include "chrome/browser/sync/sessions/sync_session_context.h" 15 #include "sync/sessions/sync_session_context.h"
16 #include "chrome/browser/sync/syncable/blob.h" 16 #include "sync/syncable/blob.h"
17 #include "chrome/browser/sync/syncable/model_type_test_util.h" 17 #include "sync/syncable/model_type_test_util.h"
18 #include "chrome/browser/sync/syncable/syncable.h" 18 #include "sync/syncable/syncable.h"
19 #include "chrome/browser/sync/test/engine/mock_connection_manager.h" 19 #include "sync/test/engine/mock_connection_manager.h"
20 #include "chrome/browser/sync/test/engine/test_directory_setter_upper.h" 20 #include "sync/test/engine/test_directory_setter_upper.h"
21 #include "sync/protocol/bookmark_specifics.pb.h" 21 #include "sync/protocol/bookmark_specifics.pb.h"
22 #include "sync/protocol/password_specifics.pb.h" 22 #include "sync/protocol/password_specifics.pb.h"
23 #include "sync/protocol/sync.pb.h" 23 #include "sync/protocol/sync.pb.h"
24 #include "sync/protocol/sync_enums.pb.h" 24 #include "sync/protocol/sync_enums.pb.h"
25 25
26 #include "testing/gtest/include/gtest/gtest.h" 26 #include "testing/gtest/include/gtest/gtest.h"
27 27
28 using syncable::Blob; 28 using syncable::Blob;
29 using ::testing::_; 29 using ::testing::_;
30 30
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 SyncProtocolError error; 289 SyncProtocolError error;
290 error.error_type = browser_sync::THROTTLED; 290 error.error_type = browser_sync::THROTTLED;
291 291
292 base::TimeTicks ticks = base::TimeTicks::Now(); 292 base::TimeTicks ticks = base::TimeTicks::Now();
293 293
294 EXPECT_CALL(delegate, OnSilencedUntil(ticks)); 294 EXPECT_CALL(delegate, OnSilencedUntil(ticks));
295 295
296 SyncerProtoUtil::HandleThrottleError(error, ticks, NULL, &delegate); 296 SyncerProtoUtil::HandleThrottleError(error, ticks, NULL, &delegate);
297 } 297 }
298 } // namespace browser_sync 298 } // namespace browser_sync
OLDNEW
« no previous file with comments | « sync/engine/syncer_proto_util.cc ('k') | sync/engine/syncer_types.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698