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

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

Issue 10662035: [Sync] Put everything in sync/api into csync namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix comments Created 8 years, 5 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 | Annotate | Revision Log
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 "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/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/sync_test.h" 11 #include "chrome/browser/sync/test/integration/sync_test.h"
12 #include "chrome/common/net/gaia/google_service_auth_error.h" 12 #include "chrome/common/net/gaia/google_service_auth_error.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "sync/protocol/sync_protocol_error.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:
25 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest); 25 DISALLOW_COPY_AND_ASSIGN(SyncErrorTest);
26 }; 26 };
27 27
28 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) { 28 IN_PROC_BROWSER_TEST_F(SyncErrorTest, BirthdayErrorTest) {
29 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 29 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 167
168 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes(); 168 synced_datatypes = GetClient(0)->service()->GetPreferredDataTypes();
169 ASSERT_FALSE(synced_datatypes.Has(syncable::TYPED_URLS)); 169 ASSERT_FALSE(synced_datatypes.Has(syncable::TYPED_URLS));
170 170
171 const BookmarkNode* node1 = AddFolder(0, 0, L"title1"); 171 const BookmarkNode* node1 = AddFolder(0, 0, L"title1");
172 SetTitle(0, node1, L"new_title1"); 172 SetTitle(0, node1, L"new_title1");
173 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync.")); 173 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion("Sync."));
174 // TODO(lipalani)" Verify initial sync ended for typed url is false. 174 // TODO(lipalani)" Verify initial sync ended for typed url is false.
175 } 175 }
176 176
OLDNEW
« no previous file with comments | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/webdata/autocomplete_syncable_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698