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

Unified Diff: chrome/browser/ui/browser_command_controller_unittest.cc

Issue 23068005: Convert UserPolicySigninService to use OAuth2TokenService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with ToT Created 7 years, 4 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/ui/browser_command_controller_unittest.cc
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index d37dade863250e0aa3f196d86db658d67d1dab52..ccd98cf9de19a1e80c9d3a2bad77c3c450237650 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -293,16 +293,17 @@ TEST_F(BrowserCommandControllerTest,
// Set up a profile with an off the record profile.
TestingProfile::Builder builder;
- TestingProfile* profile2 = builder.Build().release();
- profile2->set_incognito(true);
+ builder.SetIncognito();
+ scoped_ptr<TestingProfile> profile2(builder.Build());
TestingProfile::Builder builder2;
TestingProfile* profile1 = builder2.Build().release();
profile2->SetOriginalProfile(profile1);
EXPECT_EQ(profile2->GetOriginalProfile(), profile1);
- profile1->SetOffTheRecordProfile(profile2);
+ profile1->SetOffTheRecordProfile(profile2.PassAs<Profile>());
// Create a new browser based on the off the record profile.
- Browser::CreateParams profile_params(profile2, chrome::GetActiveDesktop());
+ Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile(),
+ chrome::GetActiveDesktop());
scoped_ptr<Browser> browser2(
chrome::CreateBrowserWithTestWindowForParams(&profile_params));

Powered by Google App Engine
This is Rietveld 408576698