Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: chrome/browser/sync/test/integration/sync_errors_test.cc

Issue 865163003: bookmarks: Move BookmarkNode into 'bookmarks' namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: enhanced_bookmarks fix Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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" 8 #include "chrome/browser/sync/profile_sync_service.h"
9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h" 9 #include "chrome/browser/sync/test/integration/bookmarks_helper.h"
10 #include "chrome/browser/sync/test/integration/passwords_helper.h" 10 #include "chrome/browser/sync/test/integration/passwords_helper.h"
11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" 11 #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" 12 #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" 13 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
14 #include "chrome/browser/sync/test/integration/sync_test.h" 14 #include "chrome/browser/sync/test/integration/sync_test.h"
15 #include "chrome/common/pref_names.h" 15 #include "chrome/common/pref_names.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_helper::AddFolder; 20 using bookmarks_helper::AddFolder;
20 using bookmarks_helper::SetTitle; 21 using bookmarks_helper::SetTitle;
21 using sync_integration_test_util::AwaitCommitActivityCompletion; 22 using sync_integration_test_util::AwaitCommitActivityCompletion;
22 23
23 namespace { 24 namespace {
24 25
25 class SyncDisabledChecker : public SingleClientStatusChangeChecker { 26 class SyncDisabledChecker : public SingleClientStatusChangeChecker {
26 public: 27 public:
27 explicit SyncDisabledChecker(ProfileSyncService* service) 28 explicit SyncDisabledChecker(ProfileSyncService* service)
28 : SingleClientStatusChangeChecker(service) {} 29 : SingleClientStatusChangeChecker(service) {}
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
221 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS)); 222 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::TYPED_URLS));
222 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS)); 223 ASSERT_TRUE(AwaitTypeDisabled(GetSyncService(0), syncer::SESSIONS));
223 224
224 const BookmarkNode* node1 = AddFolder(0, 0, "title1"); 225 const BookmarkNode* node1 = AddFolder(0, 0, "title1");
225 SetTitle(0, node1, "new_title1"); 226 SetTitle(0, node1, "new_title1");
226 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 227 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
227 // TODO(lipalani)" Verify initial sync ended for typed url is false. 228 // TODO(lipalani)" Verify initial sync ended for typed url is false.
228 } 229 }
229 230
230 } // namespace 231 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698