chromeos: Do not create the profile too early.

chrome/browser/chromeos/system/ash_system_tray_delegate.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/chromeos/system/ash_system_tray_delegate.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/audio/audio_observer.h"
 #include "ash/system/bluetooth/bluetooth_observer.h"
@@ skipping 106 matching lines @@
 
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_CHANGED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_UPGRADE_RECOMMENDED,
                    content::NotificationService::AllSources());
     registrar_.Add(this,
                    chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,
                    content::NotificationService::AllSources());
+    if (GetUserLoginStatus() == ash::user::LOGGED_IN_NONE) {
+      registrar_.Add(this,
+                     chrome::NOTIFICATION_SESSION_STARTED,
+                     content::NotificationService::AllSources());
+    }
     registrar_.Add(this,
-                   chrome::NOTIFICATION_SESSION_STARTED,
+                   chrome::NOTIFICATION_PROFILE_CREATED,
                    content::NotificationService::AllSources());
 
-    SetProfile(ProfileManager::GetDefaultProfile());
-
     network_icon_large_->SetResourceSize(NetworkMenuIcon::SIZE_LARGE);
 
     accessibility_enabled_.Init(prefs::kSpokenFeedbackEnabled,
                                 g_browser_process->local_state(), this);
 
     bluetooth_adapter_.reset(BluetoothAdapter::CreateDefaultAdapter());
     bluetooth_adapter_->AddObserver(this);
   }
 
   virtual ~SystemTrayDelegate() {
@@ skipping 470 matching lines @@
               ash::Shell::GetInstance()->tray()->accessibility_observer();
           if (observer) {
             observer->OnAccessibilityModeChanged(
                 service->GetBoolean(prefs::kSpokenFeedbackEnabled));
           }
         } else {
           NOTREACHED();
         }
         break;
       }
+      case chrome::NOTIFICATION_PROFILE_CREATED: {
+        SetProfile(content::Source<Profile>(source).ptr());
+        registrar_.Remove(this,
+                          chrome::NOTIFICATION_PROFILE_CREATED,
+                          content::NotificationService::AllSources());
+        break;
+      }
       case chrome::NOTIFICATION_SESSION_STARTED: {
         SetProfile(ProfileManager::GetDefaultProfile());
         break;
       }
       default:
         NOTREACHED();
     }
   }
 
   // Overridden from InputMethodManager::Observer.
@@ skipping 81 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate);
 };
 
 }  // namespace
 
 ash::SystemTrayDelegate* CreateSystemTrayDelegate(ash::SystemTray* tray) {
   return new chromeos::SystemTrayDelegate(tray);
 }
 
 }  // namespace chromeos