Getting rid of temporary IsGetDefaultProfileAllowed instrumentation

chrome/browser/profiles/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/browser/profiles/profile_manager.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 195 matching lines @@
 void ProfileManager::NukeDeletedProfilesFromDisk() {
   for (std::vector<base::FilePath>::iterator it =
           ProfilesToDelete().begin();
        it != ProfilesToDelete().end();
        ++it) {
     NukeProfileFromDisk(*it);
   }
   ProfilesToDelete().clear();
 }
 
-namespace {
-
-bool s_allow_get_default_profile = false;
-
-}  // namespace
-
-// static
-void ProfileManager::AllowGetDefaultProfile() {
-  s_allow_get_default_profile = true;
-}
-
-// static
-bool ProfileManager::IsGetDefaultProfileAllowed() {
-  return s_allow_get_default_profile;
-}
-
 // static
 // TODO(skuhne): Remove this method once all clients are migrated.
 Profile* ProfileManager::GetDefaultProfile() {
-  CHECK(s_allow_get_default_profile)
-      << "GetDefaultProfile() called before allowed.";
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   return profile_manager->GetDefaultProfile(profile_manager->user_data_dir_);
 }
 
 // static
 // TODO(skuhne): Remove this method once all clients are migrated.
 Profile* ProfileManager::GetDefaultProfileOrOffTheRecord() {
   return GetDefaultProfile();
 }
 
@@ skipping 168 matching lines @@
         continue;
       }
       to_return.push_back(GetProfile(user_data_dir.AppendASCII(profile)));
     }
   }
   return to_return;
 }
 
 Profile* ProfileManager::GetPrimaryUserProfile() {
 #if defined(OS_CHROMEOS)
-  // TODO(skuhne): Remove once GetDefaultProfile is removed.
-  CHECK(s_allow_get_default_profile)
-      << "GetPrimaryUserProfile() called before allowed.";
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized())
     return GetDefaultProfile();
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   // Note: The user manager will take care of guest profiles.
   return manager->GetProfileByUser(manager->GetPrimaryUser());
 #else
   return GetDefaultProfile();
 #endif
 }
 
 Profile* ProfileManager::GetActiveUserProfile() {
 #if defined(OS_CHROMEOS)
-  // TODO(skuhne): Remove once GetDefaultProfile is removed.
-  CHECK(s_allow_get_default_profile)
-      << "GetActiveUserProfile() called before allowed.";
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   if (!profile_manager->IsLoggedIn() || !chromeos::UserManager::IsInitialized())
     return GetDefaultProfile();
   chromeos::UserManager* manager = chromeos::UserManager::Get();
   // Note: The user manager will take care of guest profiles.
   return manager->GetProfileByUser(manager->GetActiveUser());
 #else
   return GetDefaultProfile();
 #endif
 }
@@ skipping 825 matching lines @@
 ProfileManager::ProfileInfo::ProfileInfo(
     Profile* profile,
     bool created)
     : profile(profile),
       created(created) {
 }
 
 ProfileManager::ProfileInfo::~ProfileInfo() {
   ProfileDestroyer::DestroyProfileWhenAppropriate(profile.release());
 }