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

Unified Diff: chrome/browser/profiles/profile_manager_unittest.cc

Issue 323133005: Enable consistent identity on android platform by default. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 6 years, 6 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/profiles/profile_manager_unittest.cc
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 50e27609f9d9ecae8d754c41a79e3d4c7e12fb78..7020999e4d54562946174539b7e125cac71386b9 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -35,6 +35,7 @@
#include "chrome/test/base/test_browser_window.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/testing_profile.h"
+#include "components/signin/core/common/profile_management_switches.h"
#include "content/public/browser/notification_service.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/test_browser_thread_bundle.h"
@@ -890,8 +891,8 @@ TEST_F(ProfileManagerTest, ProfileDisplayNameResetsDefaultName) {
return;
// The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
@@ -925,8 +926,8 @@ TEST_F(ProfileManagerTest, ProfileDisplayNamePreservesCustomName) {
return;
// The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();
@@ -965,9 +966,9 @@ TEST_F(ProfileManagerTest, ProfileDisplayNamePreservesSignedInName) {
if (!profiles::IsMultipleProfilesEnabled())
return;
- // The command line is reset at the end of every test by the test suite.
- CommandLine::ForCurrentProcess()->AppendSwitch(
- switches::kNewProfileManagement);
+ // The command line is reset at the end of every test by the test suite.
+ switches::EnableNewProfileManagementForTesting(
+ CommandLine::ForCurrentProcess());
ProfileManager* profile_manager = g_browser_process->profile_manager();
ProfileInfoCache& cache = profile_manager->GetProfileInfoCache();

Powered by Google App Engine
This is Rietveld 408576698