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

Side by Side Diff: chrome/browser/sync/backend_migrator_unittest.cc

Issue 18644007: Update some includes of chrome_notification_types.h (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix deps Created 7 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 | « chrome/browser/sync/backend_migrator.cc ('k') | no next file » | 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/backend_migrator.h" 5 #include "chrome/browser/sync/backend_migrator.h"
6 6
7 #include "base/message_loop.h" 7 #include "base/message_loop.h"
8 #include "base/tracked_objects.h" 8 #include "base/tracked_objects.h"
9 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/sync/glue/data_type_manager_mock.h" 10 #include "chrome/browser/sync/glue/data_type_manager_mock.h"
10 #include "chrome/browser/sync/profile_sync_service_mock.h" 11 #include "chrome/browser/sync/profile_sync_service_mock.h"
11 #include "chrome/common/chrome_notification_types.h"
12 #include "sync/internal_api/public/base/model_type_test_util.h" 12 #include "sync/internal_api/public/base/model_type_test_util.h"
13 #include "sync/internal_api/public/test/test_user_share.h" 13 #include "sync/internal_api/public/test/test_user_share.h"
14 #include "sync/internal_api/public/write_transaction.h" 14 #include "sync/internal_api/public/write_transaction.h"
15 #include "sync/protocol/sync.pb.h" 15 #include "sync/protocol/sync.pb.h"
16 #include "sync/syncable/directory.h" // TODO(tim): Remove. Bug 131130. 16 #include "sync/syncable/directory.h" // TODO(tim): Remove. Bug 131130.
17 #include "testing/gmock/include/gmock/gmock.h" 17 #include "testing/gmock/include/gmock/gmock.h"
18 #include "testing/gtest/include/gtest/gtest.h" 18 #include "testing/gtest/include/gtest/gtest.h"
19 19
20 using ::testing::_; 20 using ::testing::_;
21 using ::testing::Eq; 21 using ::testing::Eq;
(...skipping 310 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 EXPECT_CALL( 332 EXPECT_CALL(
333 *manager(), 333 *manager(),
334 PurgeForMigration(_, syncer::CONFIGURE_REASON_MIGRATION)).Times(1); 334 PurgeForMigration(_, syncer::CONFIGURE_REASON_MIGRATION)).Times(1);
335 migrator()->MigrateTypes(to_migrate); 335 migrator()->MigrateTypes(to_migrate);
336 SetUnsyncedTypes(syncer::ModelTypeSet()); 336 SetUnsyncedTypes(syncer::ModelTypeSet());
337 SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet()); 337 SendConfigureDone(DataTypeManager::ABORTED, syncer::ModelTypeSet());
338 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state()); 338 EXPECT_EQ(BackendMigrator::IDLE, migrator()->state());
339 } 339 }
340 340
341 }; // namespace browser_sync 341 }; // namespace browser_sync
OLDNEW
« no previous file with comments | « chrome/browser/sync/backend_migrator.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698