Ensure incognito TestingProfiles are incognito for their whole lifetime.

chrome/test/base/testing_profile_manager.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/test/base/testing_profile_manager.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
@@ skipping 100 matching lines @@
     const std::string& name) {
   DCHECK(called_set_up_);
   return CreateTestingProfile(name, scoped_ptr<PrefServiceSyncable>(),
                               base::UTF8ToUTF16(name), 0, std::string(),
                               TestingProfile::TestingFactories());
 }
 
 TestingProfile* TestingProfileManager::CreateGuestProfile() {
   DCHECK(called_set_up_);
 
-  // Set up a profile with an off the record profile.
-  TestingProfile::Builder otr_builder;
-  otr_builder.SetIncognito();
-  scoped_ptr<TestingProfile> otr_profile(otr_builder.Build());
-
   // Create the profile and register it.
   TestingProfile::Builder builder;
   builder.SetGuestSession();
   builder.SetPath(ProfileManager::GetGuestProfilePath());
 
   // Add the guest profile to the profile manager, but not to the info cache.
   TestingProfile* profile = builder.Build().release();
   profile->set_profile_name(kGuestProfileName);
 
-  otr_profile->SetOriginalProfile(profile);
-  profile->SetOffTheRecordProfile(otr_profile.PassAs<Profile>());
+  // Set up a profile with an off the record profile.
+  TestingProfile::Builder().BuildIncognito(profile);
+
   profile_manager_->AddProfile(profile);  // Takes ownership.
   profile_manager_->SetGuestProfilePrefs(profile);
 
   testing_profiles_.insert(std::make_pair(kGuestProfileName, profile));
 
   return profile;
 }
 
 void TestingProfileManager::DeleteTestingProfile(const std::string& name) {
   DCHECK(called_set_up_);
@@ skipping 57 matching lines @@
       << "ProfileManager already exists";
 
   // Set up the directory for profiles.
   ASSERT_TRUE(profiles_dir_.CreateUniqueTempDir());
 
   profile_manager_ = new testing::ProfileManager(profiles_dir_.path());
   browser_process_->SetProfileManager(profile_manager_);  // Takes ownership.
 
   called_set_up_ = true;
 }