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

Side by Side Diff: chrome/browser/sync/profile_sync_service_startup_unittest.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) 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 <utility> 5 #include <utility>
6 6
7 #include "base/files/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "build/build_config.h"
11 #include "chrome/browser/signin/account_tracker_service_factory.h" 12 #include "chrome/browser/signin/account_tracker_service_factory.h"
12 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 13 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
13 #include "chrome/browser/signin/fake_signin_manager_builder.h" 14 #include "chrome/browser/signin/fake_signin_manager_builder.h"
14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 15 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
15 #include "chrome/browser/signin/signin_manager_factory.h" 16 #include "chrome/browser/signin/signin_manager_factory.h"
16 #include "chrome/browser/sync/chrome_sync_client.h" 17 #include "chrome/browser/sync/chrome_sync_client.h"
17 #include "chrome/browser/sync/profile_sync_service_factory.h" 18 #include "chrome/browser/sync/profile_sync_service_factory.h"
18 #include "chrome/browser/sync/profile_sync_test_util.h" 19 #include "chrome/browser/sync/profile_sync_test_util.h"
19 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h" 20 #include "chrome/browser/sync/supervised_user_signin_manager_wrapper.h"
20 #include "chrome/common/channel_info.h" 21 #include "chrome/common/channel_info.h"
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted); 595 profile_->GetPrefs()->ClearPref(sync_driver::prefs::kSyncHasSetupCompleted);
595 596
596 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber()); 597 EXPECT_CALL(observer_, OnStateChanged()).Times(AnyNumber());
597 sync_->Initialize(); 598 sync_->Initialize();
598 599
599 sync_->SetSetupInProgress(true); 600 sync_->SetSetupInProgress(true);
600 IssueTestTokens(account_id); 601 IssueTestTokens(account_id);
601 sync_->SetSetupInProgress(false); 602 sync_->SetSetupInProgress(false);
602 EXPECT_FALSE(sync_->IsSyncActive()); 603 EXPECT_FALSE(sync_->IsSyncActive());
603 } 604 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698