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/macros.h" | 5 #include "base/macros.h" |
6 #include "base/run_loop.h" | 6 #include "base/run_loop.h" |
7 #include "build/build_config.h" | 7 #include "build/build_config.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" |
11 #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" |
12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
13 #include "chrome/browser/sync/test/integration/sync_test.h" | 13 #include "chrome/browser/sync/test/integration/sync_test.h" |
14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
15 #include "components/browser_sync/profile_sync_service.h" | 15 #include "components/browser_sync/profile_sync_service.h" |
16 #include "components/prefs/pref_member.h" | 16 #include "components/prefs/pref_member.h" |
17 #include "components/prefs/pref_service.h" | 17 #include "components/prefs/pref_service.h" |
18 #include "components/sync/protocol/sync_protocol_error.h" | 18 #include "components/sync/protocol/sync_protocol_error.h" |
19 #include "google_apis/gaia/google_service_auth_error.h" | 19 #include "google_apis/gaia/google_service_auth_error.h" |
20 | 20 |
21 using bookmarks::BookmarkNode; | 21 using bookmarks::BookmarkNode; |
22 using bookmarks_helper::AddFolder; | 22 using bookmarks_helper::AddFolder; |
23 using bookmarks_helper::SetTitle; | 23 using bookmarks_helper::SetTitle; |
| 24 using browser_sync::ProfileSyncService; |
24 using sync_integration_test_util::AwaitCommitActivityCompletion; | 25 using sync_integration_test_util::AwaitCommitActivityCompletion; |
25 | 26 |
26 namespace { | 27 namespace { |
27 | 28 |
28 class SyncDisabledChecker : public SingleClientStatusChangeChecker { | 29 class SyncDisabledChecker : public SingleClientStatusChangeChecker { |
29 public: | 30 public: |
30 explicit SyncDisabledChecker(ProfileSyncService* service) | 31 explicit SyncDisabledChecker(ProfileSyncService* service) |
31 : SingleClientStatusChangeChecker(service) {} | 32 : SingleClientStatusChangeChecker(service) {} |
32 | 33 |
33 bool IsExitConditionSatisfied() override { | 34 bool IsExitConditionSatisfied() override { |
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
269 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); | 270 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); |
270 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); | 271 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); |
271 | 272 |
272 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); | 273 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); |
273 SetTitle(0, node1, "new_title1"); | 274 SetTitle(0, node1, "new_title1"); |
274 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); | 275 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService(0))); |
275 // TODO(lipalani)" Verify initial sync ended for typed url is false. | 276 // TODO(lipalani)" Verify initial sync ended for typed url is false. |
276 } | 277 } |
277 | 278 |
278 } // namespace | 279 } // namespace |
OLD | NEW |