OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
6 #include "chrome/browser/sync/profile_sync_service.h" | |
7 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 6 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
8 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 7 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
9 #include "chrome/browser/sync/test/integration/sync_test.h" | 8 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 9 #include "components/browser_sync/browser/profile_sync_service.h" |
10 | 10 |
11 using bookmarks_helper::AddURL; | 11 using bookmarks_helper::AddURL; |
12 using bookmarks_helper::ModelMatchesVerifier; | 12 using bookmarks_helper::ModelMatchesVerifier; |
13 using sync_integration_test_util::AwaitCommitActivityCompletion; | 13 using sync_integration_test_util::AwaitCommitActivityCompletion; |
14 | 14 |
15 // These tests are run on the Chrome on iOS buildbots as part of cross-platform | 15 // These tests are run on the Chrome on iOS buildbots as part of cross-platform |
16 // sync integration tests, and are not meant to be run on the chromium | 16 // sync integration tests, and are not meant to be run on the chromium |
17 // buildbots. As a result, all tests below must have a DISABLED_ annotation, | 17 // buildbots. As a result, all tests below must have a DISABLED_ annotation, |
18 // which will be overridden when they are run on the Chrome on iOS buildbots. | 18 // which will be overridden when they are run on the Chrome on iOS buildbots. |
19 class CrossPlatformSyncTest : public SyncTest { | 19 class CrossPlatformSyncTest : public SyncTest { |
20 public: | 20 public: |
21 CrossPlatformSyncTest() : SyncTest(SINGLE_CLIENT) {} | 21 CrossPlatformSyncTest() : SyncTest(SINGLE_CLIENT) {} |
22 ~CrossPlatformSyncTest() override {} | 22 ~CrossPlatformSyncTest() override {} |
23 | 23 |
24 private: | 24 private: |
25 DISALLOW_COPY_AND_ASSIGN(CrossPlatformSyncTest); | 25 DISALLOW_COPY_AND_ASSIGN(CrossPlatformSyncTest); |
26 }; | 26 }; |
27 | 27 |
28 IN_PROC_BROWSER_TEST_F(CrossPlatformSyncTest, DISABLED_AddBookmark) { | 28 IN_PROC_BROWSER_TEST_F(CrossPlatformSyncTest, DISABLED_AddBookmark) { |
29 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 29 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
30 ASSERT_TRUE(AddURL(0, "Google", GURL("http://www.google.co.uk"))); | 30 ASSERT_TRUE(AddURL(0, "Google", GURL("http://www.google.co.uk"))); |
31 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); | 31 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
32 ASSERT_TRUE(ModelMatchesVerifier(0)); | 32 ASSERT_TRUE(ModelMatchesVerifier(0)); |
33 } | 33 } |
OLD | NEW |