Fix regression where component extensions were being loaded for login profile

chrome/browser/profiles/profile_manager.cc

 // Copyright (c) 2011 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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 177 matching lines @@
   // path->name mappings here, if the user syncs a local account to a
   // different Google account.
   path_map->SetString(dir_base, profile_name);
 }
 
 Profile* ProfileManager::GetDefaultProfile(const FilePath& user_data_dir) {
   FilePath default_profile_dir(user_data_dir);
   default_profile_dir = default_profile_dir.Append(GetInitialProfileDir());
 #if defined(OS_CHROMEOS)
   if (!logged_in_) {
-    Profile* profile;
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-
+    Profile* profile = GetProfile(default_profile_dir);
     // For cros, return the OTR profile so we never accidentally keep
     // user data in an unencrypted profile. But doing this makes
     // many of the browser and ui tests fail. We do return the OTR profile
     // if the login-profile switch is passed so that we can test this.
     // TODO(davemoore) Fix the tests so they allow OTR profiles.
-    if (!command_line.HasSwitch(switches::kTestType) ||
-        command_line.HasSwitch(switches::kLoginProfile)) {
-      // Don't init extensions for this profile
-      profile = GetProfile(default_profile_dir);
-      profile = profile->GetOffTheRecordProfile();
-    } else {
-      profile = GetProfile(default_profile_dir);
-    }
+    if (ShouldGoOffTheRecord())
+      return profile->GetOffTheRecordProfile();
     return profile;
   }
 #endif
   return GetProfile(default_profile_dir);
 }
 
 bool ProfileManager::IsValidProfile(Profile* profile) {
   for (ProfilesInfoMap::iterator iter = profiles_info_.begin();
        iter != profiles_info_.end(); ++iter) {
     if (iter->second->created) {
@@ skipping 81 matching lines @@
   // Make sure that we're not loading a profile with the same ID as a profile
   // that's already loaded.
   if (GetProfileByPath(profile->GetPath())) {
     NOTREACHED() << "Attempted to add profile with the same path (" <<
                     profile->GetPath().value() <<
                     ") as an already-loaded profile.";
     return false;
   }
 
   RegisterProfile(profile, true);
-  DoFinalInit(profile, false);
+  DoFinalInit(profile, ShouldGoOffTheRecord());
   return true;
 }
 
 ProfileManager::ProfileInfo* ProfileManager::RegisterProfile(Profile* profile,
                                                              bool created) {
   ProfileInfo* info = new ProfileInfo(profile, created);
   profiles_info_.insert(std::make_pair(profile->GetPath(), info));
   return info;
 }
 
@@ skipping 48 matching lines @@
 void ProfileManager::OnProfileCreated(Profile* profile, bool success) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   ProfilesInfoMap::iterator iter = profiles_info_.find(profile->GetPath());
   DCHECK(iter != profiles_info_.end());
   ProfileInfo* info = iter->second.get();
 
   std::vector<ProfileManagerObserver*> observers;
   info->observers.swap(observers);
 
-  bool go_off_the_record = false;
+  bool go_off_the_record = ShouldGoOffTheRecord();
   if (success) {
-#if defined(OS_CHROMEOS)
-    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (!logged_in_ &&
-        (!command_line.HasSwitch(switches::kTestType) ||
-         command_line.HasSwitch(switches::kLoginProfile))) {
-      go_off_the_record = true;
-    }
-#endif
     if (!go_off_the_record) {
       for (size_t i = 0; i < observers.size(); ++i) {
         observers[i]->OnProfileCreated(
             profile, ProfileManagerObserver::STATUS_CREATED);
       }
     }
     DoFinalInit(profile, go_off_the_record);
     info->created = true;
   } else {
     profile = NULL;
@@ skipping 138 matching lines @@
         profile->GetPath(),
         l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), 0);
   } else {
     cache.AddProfileToCache(
         profile->GetPath(),
         cache.ChooseNameForNewProfile(),
         cache.ChooseAvatarIconIndexForNewProfile());
   }
 }
 
+bool ProfileManager::ShouldGoOffTheRecord() {
+  bool go_off_the_record = false;
+#if defined(OS_CHROMEOS)
+  const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+  if (!logged_in_ &&
+      (!command_line.HasSwitch(switches::kTestType) ||
+       command_line.HasSwitch(switches::kLoginProfile))) {
+    go_off_the_record = true;
+  }
+#endif
+  return go_off_the_record;
+}
+
 void ProfileManager::ScheduleProfileForDeletion(const FilePath& profile_dir) {
   // TODO(sail): Due to bug 88586 we don't delete the profile instance. Once we
   // start deleting the profile instance we need to close background apps too.
   Profile* profile = GetProfileByPath(profile_dir);
   if (profile)
     BrowserList::CloseAllBrowsersWithProfile(profile);
   profiles_to_delete_.push_back(profile_dir);
   ProfileInfoCache& cache = GetProfileInfoCache();
   cache.DeleteProfileFromCache(profile_dir);
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
   return true;
 #endif
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 }