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

Side by Side Diff: sync/test/engine/syncer_command_test.h

Issue 10699044: [Sync] Move sync/{internal_api,syncable} into syncer namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync to head Created 8 years, 5 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/test/engine/mock_connection_manager.cc ('k') | sync/test/engine/syncer_command_test.cc » ('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 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ 5 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
6 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ 6 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
7 #pragma once 7 #pragma once
8 8
9 #include <algorithm> 9 #include <algorithm>
10 #include <string> 10 #include <string>
(...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after
204 FakeExtensionsActivityMonitor extensions_activity_monitor_; 204 FakeExtensionsActivityMonitor extensions_activity_monitor_;
205 scoped_ptr<ThrottledDataTypeTracker> throttled_data_type_tracker_; 205 scoped_ptr<ThrottledDataTypeTracker> throttled_data_type_tracker_;
206 TrafficRecorder traffic_recorder_; 206 TrafficRecorder traffic_recorder_;
207 DISALLOW_COPY_AND_ASSIGN(SyncerCommandTestBase); 207 DISALLOW_COPY_AND_ASSIGN(SyncerCommandTestBase);
208 }; 208 };
209 209
210 class SyncerCommandTest : public SyncerCommandTestBase { 210 class SyncerCommandTest : public SyncerCommandTestBase {
211 public: 211 public:
212 virtual void SetUp() OVERRIDE; 212 virtual void SetUp() OVERRIDE;
213 virtual void TearDown() OVERRIDE; 213 virtual void TearDown() OVERRIDE;
214 virtual Directory* directory() OVERRIDE; 214 virtual syncable::Directory* directory() OVERRIDE;
215 215
216 private: 216 private:
217 TestDirectorySetterUpper dir_maker_; 217 TestDirectorySetterUpper dir_maker_;
218 }; 218 };
219 219
220 class MockDirectorySyncerCommandTest : public SyncerCommandTestBase { 220 class MockDirectorySyncerCommandTest : public SyncerCommandTestBase {
221 public: 221 public:
222 MockDirectorySyncerCommandTest(); 222 MockDirectorySyncerCommandTest();
223 virtual ~MockDirectorySyncerCommandTest(); 223 virtual ~MockDirectorySyncerCommandTest();
224 virtual Directory* directory() OVERRIDE; 224 virtual syncable::Directory* directory() OVERRIDE;
225 225
226 MockDirectory* mock_directory() { 226 syncable::MockDirectory* mock_directory() {
227 return static_cast<MockDirectory*>(directory()); 227 return static_cast<syncable::MockDirectory*>(directory());
228 } 228 }
229 229
230 virtual void SetUp() OVERRIDE; 230 virtual void SetUp() OVERRIDE;
231 231
232 TestUnrecoverableErrorHandler handler_; 232 TestUnrecoverableErrorHandler handler_;
233 MockDirectory mock_directory_; 233 syncable::MockDirectory mock_directory_;
234 }; 234 };
235 235
236 } // namespace syncer 236 } // namespace syncer
237 237
238 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_ 238 #endif // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
OLDNEW
« no previous file with comments | « sync/test/engine/mock_connection_manager.cc ('k') | sync/test/engine/syncer_command_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698