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

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

Issue 7861013: Fix the false-positive detection of commit errors (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Another attempt at detecting errors Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/search_engines/template_url_service.h" 5 #include "chrome/browser/search_engines/template_url_service.h"
6 #include "chrome/browser/sync/profile_sync_service_harness.h" 6 #include "chrome/browser/sync/profile_sync_service_harness.h"
7 #include "chrome/browser/sync/test/integration/search_engines_helper.h" 7 #include "chrome/browser/sync/test/integration/search_engines_helper.h"
8 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
9 9
10 using search_engines_helper::AddSearchEngine; 10 using search_engines_helper::AddSearchEngine;
(...skipping 10 matching lines...) Expand all
21 private: 21 private:
22 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest); 22 DISALLOW_COPY_AND_ASSIGN(SingleClientSearchEnginesSyncTest);
23 }; 23 };
24 24
25 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) { 25 IN_PROC_BROWSER_TEST_F(SingleClientSearchEnginesSyncTest, Sanity) {
26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 26 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
27 ASSERT_TRUE(ServiceMatchesVerifier(0)); 27 ASSERT_TRUE(ServiceMatchesVerifier(0));
28 28
29 AddSearchEngine(0, 0); 29 AddSearchEngine(0, 0);
30 30
31 ASSERT_TRUE(GetClient(0)->AwaitSyncCycleCompletion( 31 ASSERT_TRUE(GetClient(0)->AwaitFullSyncCompletion(
32 "Waiting for search engines to update.")); 32 "Waiting for search engines to update."));
33 ASSERT_TRUE(ServiceMatchesVerifier(0)); 33 ASSERT_TRUE(ServiceMatchesVerifier(0));
34 } 34 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698