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 186 matching lines @@
   if (!logged_in_) {
     Profile* profile;
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
 
     // 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)) {

[Dmitry Polukhin, 2011/08/12 08:04:31]

There are 3 places with identical no trivial check and ifdef. I think it makes
sense to move it into separate function with comment as above and TODO.

#1

[DaveMoore, 2011/08/12 16:37:42]

I combined two into a call, but one had some logic within the check so I left
it.
On 2011/08/12 08:04:31, Dmitry Polukhin wrote:

       // Don't init extensions for this profile

[Dmitry Polukhin, 2011/08/12 08:04:31]

This comment has no sense here anymore. It should be in that function with
check.

[DaveMoore, 2011/08/12 16:37:42]

Done.

       profile = GetProfile(default_profile_dir);
       profile = profile->GetOffTheRecordProfile();
     } else {
       profile = GetProfile(default_profile_dir);
     }
     return profile;
   }
 #endif
   return GetProfile(default_profile_dir);
 }
@@ skipping 86 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);
+  bool go_off_the_record = true;

[Denis Lagno, 2011/08/12 06:50:02]

if you want to restore the behaviour that existed before my erroneous CL then
you need to make it false here.

[DaveMoore, 2011/08/12 16:37:42]

Done.

+#if defined(OS_CHROMEOS)
+    const CommandLine& command_line = *CommandLine::ForCurrentProcess();
+    if (!logged_in_ &&
+        (!command_line.HasSwitch(switches::kTestType) ||
+         command_line.HasSwitch(switches::kLoginProfile))) {

[Dmitry Polukhin, 2011/08/12 08:04:31]

#2

+      go_off_the_record = true;

[zel, 2011/08/12 16:15:40]

go_off_the_record is always true!?

[DaveMoore, 2011/08/12 16:37:42]

Done.

+    }
+#endif
+  DoFinalInit(profile, go_off_the_record);
   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 54 matching lines @@
 
   std::vector<ProfileManagerObserver*> observers;
   info->observers.swap(observers);
 
   bool go_off_the_record = false;
   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))) {

[Dmitry Polukhin, 2011/08/12 08:04:31]

#3

       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);
@@ skipping 159 matching lines @@
   cache.DeleteProfileFromCache(profile_dir);
 }
 
 // static
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(TOOLKIT_VIEWS) && !defined(OS_CHROMEOS)
   return true;
 #endif
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 }