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

Side by Side Diff: chrome/browser/sync/test/integration/two_client_themes_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
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/basictypes.h" 5 #include "base/basictypes.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/themes_helper.h" 7 #include "chrome/browser/sync/test/integration/themes_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 themes_helper::GetCustomTheme; 10 using themes_helper::GetCustomTheme;
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; 222 ASSERT_TRUE(SetupSync()) << "SetupSync() failed.";
223 223
224 ASSERT_FALSE(UsingCustomTheme(GetProfile(0))); 224 ASSERT_FALSE(UsingCustomTheme(GetProfile(0)));
225 ASSERT_FALSE(UsingCustomTheme(GetProfile(1))); 225 ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
226 ASSERT_FALSE(UsingCustomTheme(verifier())); 226 ASSERT_FALSE(UsingCustomTheme(verifier()));
227 227
228 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes()); 228 ASSERT_TRUE(GetClient(1)->DisableSyncForAllDatatypes());
229 UseCustomTheme(GetProfile(0), 0); 229 UseCustomTheme(GetProfile(0), 0);
230 UseCustomTheme(verifier(), 0); 230 UseCustomTheme(verifier(), 0);
231 ASSERT_TRUE( 231 ASSERT_TRUE(
232 GetClient(0)->AwaitSyncCycleCompletion("Installed a custom theme.")); 232 GetClient(0)->AwaitFullSyncCompletion("Installed a custom theme."));
233 233
234 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0))); 234 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
235 ASSERT_FALSE(UsingCustomTheme(GetProfile(1))); 235 ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
236 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier())); 236 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
237 237
238 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes()); 238 ASSERT_TRUE(GetClient(1)->EnableSyncForAllDatatypes());
239 ASSERT_TRUE(AwaitQuiescence()); 239 ASSERT_TRUE(AwaitQuiescence());
240 240
241 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0))); 241 ASSERT_EQ(GetCustomTheme(0), GetThemeID(GetProfile(0)));
242 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier())); 242 ASSERT_EQ(GetCustomTheme(0), GetThemeID(verifier()));
243 ASSERT_FALSE(UsingCustomTheme(GetProfile(1))); 243 ASSERT_FALSE(UsingCustomTheme(GetProfile(1)));
244 ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0))); 244 ASSERT_TRUE(ThemeIsPendingInstall(GetProfile(1), GetCustomTheme(0)));
245 } 245 }
OLDNEW
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698