OLD | NEW |
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 "base/prefs/pref_member.h" | 5 #include "base/prefs/pref_member.h" |
6 #include "base/prefs/pref_service.h" | 6 #include "base/prefs/pref_service.h" |
7 #include "chrome/browser/sync/profile_sync_service.h" | 7 #include "chrome/browser/sync/profile_sync_service.h" |
8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
9 #include "chrome/browser/sync/test/integration/passwords_helper.h" | 9 #include "chrome/browser/sync/test/integration/passwords_helper.h" |
10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
159 // Trigger error on every 2 out of 3 requests. | 159 // Trigger error on every 2 out of 3 requests. |
160 TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_TWO_THIRDS); | 160 TriggerSyncError(protocol_error, SyncTest::ERROR_FREQUENCY_TWO_THIRDS); |
161 | 161 |
162 // Now enable a datatype, whose first 2 syncs would fail, but we should | 162 // Now enable a datatype, whose first 2 syncs would fail, but we should |
163 // recover and setup succesfully on the third attempt. | 163 // recover and setup succesfully on the third attempt. |
164 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::AUTOFILL)); | 164 ASSERT_TRUE(GetClient(0)->EnableSyncForDatatype(syncer::AUTOFILL)); |
165 } | 165 } |
166 } | 166 } |
167 | 167 |
168 IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, | 168 IN_PROC_BROWSER_TEST_F(LegacySyncErrorTest, |
169 BirthdayErrorUsingActionableErrorTest) { | 169 DISABLED_BirthdayErrorUsingActionableErrorTest) { |
170 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 170 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
171 | 171 |
172 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); | 172 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); |
173 SetTitle(0, node1, "new_title1"); | 173 SetTitle(0, node1, "new_title1"); |
174 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); | 174 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
175 | 175 |
176 syncer::SyncProtocolError protocol_error; | 176 syncer::SyncProtocolError protocol_error; |
177 protocol_error.error_type = syncer::NOT_MY_BIRTHDAY; | 177 protocol_error.error_type = syncer::NOT_MY_BIRTHDAY; |
178 protocol_error.action = syncer::DISABLE_SYNC_ON_CLIENT; | 178 protocol_error.action = syncer::DISABLE_SYNC_ON_CLIENT; |
179 protocol_error.error_description = "Not My Fault"; | 179 protocol_error.error_description = "Not My Fault"; |
(...skipping 26 matching lines...) Expand all Loading... |
206 synced_datatypes = GetSyncService((0))->GetPreferredDataTypes(); | 206 synced_datatypes = GetSyncService((0))->GetPreferredDataTypes(); |
207 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS)); | 207 ASSERT_FALSE(synced_datatypes.Has(syncer::TYPED_URLS)); |
208 | 208 |
209 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); | 209 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); |
210 SetTitle(0, node1, "new_title1"); | 210 SetTitle(0, node1, "new_title1"); |
211 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); | 211 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); |
212 // TODO(lipalani)" Verify initial sync ended for typed url is false. | 212 // TODO(lipalani)" Verify initial sync ended for typed url is false. |
213 } | 213 } |
214 | 214 |
215 } // namespace | 215 } // namespace |
OLD | NEW |