Ensure incognito TestingProfiles are incognito for their whole lifetime.

chrome/browser/ui/browser_command_controller_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/browser_command_controller.h"
 
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/command_updater.h"
@@ skipping 228 matching lines @@
     return;
 
   // The command line is reset at the end of every test by the test suite.
   switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
 
   TestingProfileManager testing_profile_manager(
       TestingBrowserProcess::GetGlobal());
   ASSERT_TRUE(testing_profile_manager.SetUp());
 
   // Set up guest a profile.
+  scoped_ptr<TestingProfile> original_profile =
+      TestingProfile::Builder().Build();
   TestingProfile::Builder guest_builder;
-  guest_builder.SetIncognito();  // Guest profiles are off the record.
   guest_builder.SetGuestSession();
   guest_builder.SetPath(ProfileManager::GetGuestProfilePath());
-  scoped_ptr<TestingProfile>guest_profile = guest_builder.Build();
+  // Browsers in Guest mode must be off the record profiles.
+  TestingProfile* guest_profile =
+      guest_builder.BuildIncognito(original_profile.get());
 
   ASSERT_TRUE(guest_profile->IsGuestSession());
 
   // Create a new browser based on the guest profile.
-  Browser::CreateParams profile_params(guest_profile.get(),
+  Browser::CreateParams profile_params(guest_profile,
                                        chrome::GetActiveDesktop());
   scoped_ptr<Browser> guest_browser(
       chrome::CreateBrowserWithTestWindowForParams(&profile_params));
   chrome::BrowserCommandController command_controller(guest_browser.get());
   const CommandUpdater* command_updater = command_controller.command_updater();
 #if defined(OS_CHROMEOS)
   // Chrome OS uses system tray menu to handle multi-profiles.
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
 #else
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_AVATAR_MENU));
@@ skipping 154 matching lines @@
   EXPECT_TRUE(testprofile);
   testprofile->SetGuestSession(true);
 
   browser()->command_controller()->FullscreenStateChanged();
   EXPECT_TRUE(chrome::IsCommandEnabled(browser(), IDC_OPTIONS));
   EXPECT_FALSE(chrome::IsCommandEnabled(browser(), IDC_IMPORT_SETTINGS));
 }
 
 TEST_F(BrowserCommandControllerTest, IncognitoModeOnSigninAllowedPrefChange) {
   // Set up a profile with an off the record profile.
-  TestingProfile::Builder builder;
-  builder.SetIncognito();
-  scoped_ptr<TestingProfile> profile2(builder.Build());
-  TestingProfile::Builder builder2;
-  scoped_ptr<TestingProfile> profile1 = builder2.Build();
-  profile2->SetOriginalProfile(profile1.get());
+  scoped_ptr<TestingProfile> profile1 = TestingProfile::Builder().Build();
+  Profile* profile2 = profile1->GetOffTheRecordProfile();
+
   EXPECT_EQ(profile2->GetOriginalProfile(), profile1.get());
-  profile1->SetOffTheRecordProfile(profile2.PassAs<Profile>());
 
   // Create a new browser based on the off the record profile.
   Browser::CreateParams profile_params(profile1->GetOffTheRecordProfile(),
                                        chrome::GetActiveDesktop());
   scoped_ptr<Browser> browser2(
       chrome::CreateBrowserWithTestWindowForParams(&profile_params));
 
   chrome::BrowserCommandController command_controller(browser2.get());
   const CommandUpdater* command_updater = command_controller.command_updater();
 
   // Check that the SYNC_SETUP command is updated on preference change.
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
   profile1->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
 }
 
 TEST_F(BrowserCommandControllerTest, OnSigninAllowedPrefChange) {
   chrome::BrowserCommandController command_controller(browser());
   const CommandUpdater* command_updater = command_controller.command_updater();
 
   // Check that the SYNC_SETUP command is updated on preference change.
   EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
   profile()->GetPrefs()->SetBoolean(prefs::kSigninAllowed, false);
   EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_SHOW_SYNC_SETUP));
 }