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 "chrome/browser/prefs/pref_member.h" | 5 #include "chrome/browser/prefs/pref_member.h" |
6 #include "chrome/browser/prefs/pref_service.h" | 6 #include "chrome/browser/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/profile_sync_service_harness.h" | 8 #include "chrome/browser/sync/profile_sync_service_harness.h" |
9 #include "chrome/browser/sync/protocol/sync_protocol_error.h" | |
10 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
11 #include "chrome/browser/sync/test/integration/passwords_helper.h" | 10 #include "chrome/browser/sync/test/integration/passwords_helper.h" |
12 #include "chrome/browser/sync/test/integration/sync_test.h" | 11 #include "chrome/browser/sync/test/integration/sync_test.h" |
13 #include "chrome/common/net/gaia/google_service_auth_error.h" | 12 #include "chrome/common/net/gaia/google_service_auth_error.h" |
14 #include "chrome/common/pref_names.h" | 13 #include "chrome/common/pref_names.h" |
| 14 #include "sync/protocol/sync_protocol_error.h" |
15 | 15 |
16 using bookmarks_helper::AddFolder; | 16 using bookmarks_helper::AddFolder; |
17 using bookmarks_helper::SetTitle; | 17 using bookmarks_helper::SetTitle; |
18 | 18 |
19 class SyncErrorTest : public SyncTest{ | 19 class SyncErrorTest : public SyncTest{ |
20 public: | 20 public: |
21 SyncErrorTest() : SyncTest(SINGLE_CLIENT) {} | 21 SyncErrorTest() : SyncTest(SINGLE_CLIENT) {} |
22 virtual ~SyncErrorTest() {} | 22 virtual ~SyncErrorTest() {} |
23 | 23 |
24 private: | 24 private: |
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
169 | 169 |
170 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes(); | 170 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes(); |
171 ASSERT_FALSE(synced_datatypes.Has(syncable::TYPED_URLS)); | 171 ASSERT_FALSE(synced_datatypes.Has(syncable::TYPED_URLS)); |
172 | 172 |
173 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); | 173 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); |
174 SetTitle(0, node1, L"new_title1"); | 174 SetTitle(0, node1, L"new_title1"); |
175 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync.")); | 175 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync.")); |
176 // TODO(lipalani)" Verify initial sync ended for typed url is false. | 176 // TODO(lipalani)" Verify initial sync ended for typed url is false. |
177 } | 177 } |
178 | 178 |
OLD | NEW |