OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/test/live_sync/live_bookmarks_sync_test.h" | 5 #include "chrome/test/live_sync/live_bookmarks_sync_test.h" |
6 | 6 |
7 #include "base/rand_util.h" | 7 #include "base/rand_util.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 | 10 |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 SC_AddFirstBMWithoutFavicon) { | 116 SC_AddFirstBMWithoutFavicon) { |
117 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 117 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
118 ASSERT_TRUE(AllModelsMatchVerifier()); | 118 ASSERT_TRUE(AllModelsMatchVerifier()); |
119 | 119 |
120 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); | 120 ASSERT_TRUE(AddURL(0, kGenericURLTitle, GURL(kGenericURL)) != NULL); |
121 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 121 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
122 ASSERT_TRUE(AllModelsMatchVerifier()); | 122 ASSERT_TRUE(AllModelsMatchVerifier()); |
123 } | 123 } |
124 | 124 |
125 // Test Scribe ID - 370489. | 125 // Test Scribe ID - 370489. |
| 126 // TODO(rsimha): Enable after http://crbug.com/69694 is fixed. |
126 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, | 127 IN_PROC_BROWSER_TEST_F(TwoClientLiveBookmarksSyncTest, |
127 SC_AddFirstBMWithFavicon) { | 128 FAILS_SC_AddFirstBMWithFavicon) { |
128 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 129 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
129 ASSERT_TRUE(AllModelsMatchVerifier()); | 130 ASSERT_TRUE(AllModelsMatchVerifier()); |
130 | 131 |
131 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL)); | 132 const BookmarkNode* bookmark = AddURL(0, kGenericURLTitle, GURL(kGenericURL)); |
132 ASSERT_TRUE(bookmark != NULL); | 133 ASSERT_TRUE(bookmark != NULL); |
133 SetFavicon(0, bookmark, GenericFavicon()); | 134 SetFavicon(0, bookmark, GenericFavicon()); |
134 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); | 135 ASSERT_TRUE(GetClient(0)->AwaitMutualSyncCycleCompletion(GetClient(1))); |
135 ASSERT_TRUE(AllModelsMatchVerifier()); | 136 ASSERT_TRUE(AllModelsMatchVerifier()); |
136 } | 137 } |
137 | 138 |
(...skipping 1328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1466 } | 1467 } |
1467 | 1468 |
1468 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 1469 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
1469 ASSERT_TRUE(AwaitQuiescence()); | 1470 ASSERT_TRUE(AwaitQuiescence()); |
1470 ASSERT_TRUE(AllModelsMatch()); | 1471 ASSERT_TRUE(AllModelsMatch()); |
1471 | 1472 |
1472 for (int i = 1; i < 5 ; ++i) { | 1473 for (int i = 1; i < 5 ; ++i) { |
1473 ASSERT_TRUE(CountBookmarksWithTitlesMatching(1, IndexedURLTitle(i)) == i); | 1474 ASSERT_TRUE(CountBookmarksWithTitlesMatching(1, IndexedURLTitle(i)) == i); |
1474 } | 1475 } |
1475 } | 1476 } |
OLD | NEW |