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

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

Issue 1545223002: Switch to standard integer types in chrome/browser/, part 4 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 4 years, 12 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) 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/macros.h"
6 #include "build/build_config.h"
6 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" 7 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h"
7 #include "chrome/browser/sync/test/integration/sync_test.h" 8 #include "chrome/browser/sync/test/integration/sync_test.h"
8 #include "chrome/browser/sync/test/integration/themes_helper.h" 9 #include "chrome/browser/sync/test/integration/themes_helper.h"
9 #include "components/browser_sync/browser/profile_sync_service.h" 10 #include "components/browser_sync/browser/profile_sync_service.h"
10 11
11 using sync_integration_test_util::AwaitCommitActivityCompletion; 12 using sync_integration_test_util::AwaitCommitActivityCompletion;
12 using themes_helper::GetCustomTheme; 13 using themes_helper::GetCustomTheme;
13 using themes_helper::GetThemeID; 14 using themes_helper::GetThemeID;
14 using themes_helper::UseCustomTheme; 15 using themes_helper::UseCustomTheme;
15 using themes_helper::UseDefaultTheme; 16 using themes_helper::UseDefaultTheme;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 UseDefaultTheme(GetProfile(0)); 88 UseDefaultTheme(GetProfile(0));
88 UseDefaultTheme(verifier()); 89 UseDefaultTheme(verifier());
89 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); 90 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
90 ASSERT_TRUE(UsingDefaultTheme(verifier())); 91 ASSERT_TRUE(UsingDefaultTheme(verifier()));
91 92
92 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0)))); 93 ASSERT_TRUE(AwaitCommitActivityCompletion(GetSyncService((0))));
93 94
94 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0))); 95 ASSERT_TRUE(UsingDefaultTheme(GetProfile(0)));
95 ASSERT_TRUE(UsingDefaultTheme(verifier())); 96 ASSERT_TRUE(UsingDefaultTheme(verifier()));
96 } 97 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698