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 "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/sync/profile_sync_service.h" | |
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" | 8 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" |
10 #include "chrome/browser/sync/test/integration/passwords_helper.h" | 9 #include "chrome/browser/sync/test/integration/passwords_helper.h" |
11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 10 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
12 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" | 11 #include "chrome/browser/sync/test/integration/single_client_status_change_check
er.h" |
13 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
14 #include "chrome/browser/sync/test/integration/sync_test.h" | 13 #include "chrome/browser/sync/test/integration/sync_test.h" |
15 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
| 15 #include "components/browser_sync/browser/profile_sync_service.h" |
16 #include "google_apis/gaia/google_service_auth_error.h" | 16 #include "google_apis/gaia/google_service_auth_error.h" |
17 #include "sync/protocol/sync_protocol_error.h" | 17 #include "sync/protocol/sync_protocol_error.h" |
18 | 18 |
19 using bookmarks::BookmarkNode; | 19 using bookmarks::BookmarkNode; |
20 using bookmarks_helper::AddFolder; | 20 using bookmarks_helper::AddFolder; |
21 using bookmarks_helper::SetTitle; | 21 using bookmarks_helper::SetTitle; |
22 using sync_integration_test_util::AwaitCommitActivityCompletion; | 22 using sync_integration_test_util::AwaitCommitActivityCompletion; |
23 | 23 |
24 namespace { | 24 namespace { |
25 | 25 |
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
276 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); | 276 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); |
277 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); | 277 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); |
278 | 278 |
279 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); | 279 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); |
280 SetTitle(0, node1, "new_title1"); | 280 SetTitle(0, node1, "new_title1"); |
281 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); | 281 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); |
282 // TODO(lipalani)" Verify initial sync ended for typed url is false. | 282 // TODO(lipalani)" Verify initial sync ended for typed url is false. |
283 } | 283 } |
284 | 284 |
285 } // namespace | 285 } // namespace |
OLD | NEW |