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

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

Issue 7828055: Move sync test code out of chrome/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 3 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 // TODO(akalin): This file is basically just a unit test for 5 // TODO(akalin): This file is basically just a unit test for
6 // BookmarkChangeProcessor. Write unit tests for 6 // BookmarkChangeProcessor. Write unit tests for
7 // BookmarkModelAssociator separately. 7 // BookmarkModelAssociator separately.
8 8
9 #include <stack> 9 #include <stack>
10 #include <vector> 10 #include <vector>
(...skipping 12 matching lines...) Expand all
23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h" 23 #include "chrome/browser/sync/abstract_profile_sync_service_test.h"
24 #include "chrome/browser/sync/api/sync_error.h" 24 #include "chrome/browser/sync/api/sync_error.h"
25 #include "chrome/browser/sync/glue/bookmark_change_processor.h" 25 #include "chrome/browser/sync/glue/bookmark_change_processor.h"
26 #include "chrome/browser/sync/glue/bookmark_model_associator.h" 26 #include "chrome/browser/sync/glue/bookmark_model_associator.h"
27 #include "chrome/browser/sync/internal_api/read_node.h" 27 #include "chrome/browser/sync/internal_api/read_node.h"
28 #include "chrome/browser/sync/internal_api/read_transaction.h" 28 #include "chrome/browser/sync/internal_api/read_transaction.h"
29 #include "chrome/browser/sync/internal_api/sync_manager.h" 29 #include "chrome/browser/sync/internal_api/sync_manager.h"
30 #include "chrome/browser/sync/internal_api/write_node.h" 30 #include "chrome/browser/sync/internal_api/write_node.h"
31 #include "chrome/browser/sync/internal_api/write_transaction.h" 31 #include "chrome/browser/sync/internal_api/write_transaction.h"
32 #include "chrome/browser/sync/syncable/directory_manager.h" 32 #include "chrome/browser/sync/syncable/directory_manager.h"
33 #include "chrome/browser/sync/test/engine/test_id_factory.h"
34 #include "chrome/browser/sync/test/engine/test_user_share.h"
33 #include "chrome/common/chrome_switches.h" 35 #include "chrome/common/chrome_switches.h"
34 #include "chrome/test/base/testing_profile.h" 36 #include "chrome/test/base/testing_profile.h"
35 #include "chrome/test/sync/engine/test_id_factory.h"
36 #include "chrome/test/sync/engine/test_user_share.h"
37 #include "content/browser/browser_thread.h" 37 #include "content/browser/browser_thread.h"
38 #include "testing/gmock/include/gmock/gmock.h" 38 #include "testing/gmock/include/gmock/gmock.h"
39 #include "testing/gtest/include/gtest/gtest.h" 39 #include "testing/gtest/include/gtest/gtest.h"
40 40
41 namespace browser_sync { 41 namespace browser_sync {
42 42
43 using testing::_; 43 using testing::_;
44 using testing::InvokeWithoutArgs; 44 using testing::InvokeWithoutArgs;
45 using testing::Mock; 45 using testing::Mock;
46 using testing::StrictMock; 46 using testing::StrictMock;
(...skipping 1384 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 // Make sure we're back in sync. In real life, the user would need 1431 // Make sure we're back in sync. In real life, the user would need
1432 // to reauthenticate before this happens, but in the test, authentication 1432 // to reauthenticate before this happens, but in the test, authentication
1433 // is sidestepped. 1433 // is sidestepped.
1434 ExpectBookmarkModelMatchesTestData(); 1434 ExpectBookmarkModelMatchesTestData();
1435 ExpectModelMatch(); 1435 ExpectModelMatch();
1436 } 1436 }
1437 1437
1438 } // namespace 1438 } // namespace
1439 1439
1440 } // namespace browser_sync 1440 } // namespace browser_sync
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698