chrome/test/base/testing_profile_manager.cc - Issue 1038423004: Reland of: Change default code flag to NewAvatarMenu.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/test/base/testing_profile_manager.cc

Issue 1038423004: Reland of: Change default code flag to NewAvatarMenu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove unneeded code from ProfileInfoCacheTest Created 5 years, 8 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

« no previous file with comments | « chrome/chrome_tests.gypi ('k') | components/signin/core/common/profile_management_switches.cc » ('j') | no next file with comments »

OLD	NEW
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/test/base/testing_profile_manager.h"	5 #include "chrome/test/base/testing_profile_manager.h"

6	6

7 #include "base/memory/ref_counted.h"	7 #include "base/memory/ref_counted.h"

8 #include "base/strings/utf_string_conversions.h"	8 #include "base/strings/utf_string_conversions.h"

9 #include "chrome/browser/prefs/pref_service_syncable.h"	9 #include "chrome/browser/prefs/pref_service_syncable.h"

10 #include "chrome/browser/profiles/profile_info_cache.h"	10 #include "chrome/browser/profiles/profile_info_cache.h"

(...skipping 222 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
233 void TestingProfileManager::SetUpInternal() {	233 void TestingProfileManager::SetUpInternal() {

234 ASSERT_FALSE(browser_process_->profile_manager())	234 ASSERT_FALSE(browser_process_->profile_manager())

235 << "ProfileManager already exists";	235 << "ProfileManager already exists";

236	236

237 // Set up the directory for profiles.	237 // Set up the directory for profiles.

238 ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());	238 ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());

239	239

240 profile_manager_ = new testing::ProfileManager(profiles_dir_.path());	240 profile_manager_ = new testing::ProfileManager(profiles_dir_.path());

241 browser_process_->SetProfileManager(profile_manager_); // Takes ownership.	241 browser_process_->SetProfileManager(profile_manager_); // Takes ownership.

242	242

	243 profile_manager_->GetProfileInfoCache().

	244 set_disable_avatar_download_for_testing(true);

243 called_set_up_ = true;	245 called_set_up_ = true;

244 }	246 }

OLD	NEW