Eliminate CrosLibrary::EnsureLoaded

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 405 matching lines @@
   }
 }
 
 void ProfileManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
 #if defined(OS_CHROMEOS)
   if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED) {
     const CommandLine& command_line = *CommandLine::ForCurrentProcess();
-    if (chromeos::CrosLibrary::Get()->EnsureLoaded() &&
+    if (chromeos::CrosLibrary::Get()->libcros_loaded() &&

[satorux1, 2011/11/16 23:51:34]

I think we don't need this, as
chromeos::CrosLibrary::Get()->GetCryptohomeLibrary() should work, right?

[stevenjb, 2011/11/17 00:23:33]

Double checked that IsMounted() returns |true| in the stub, so removed the test.

         !command_line.HasSwitch(switches::kTestType)) {
       // If we don't have a mounted profile directory we're in trouble.
       // TODO(davemoore) Once we have better api this check should ensure that
       // our profile directory is the one that's mounted, and that it's mounted
       // as the current user.
       CHECK(chromeos::CrosLibrary::Get()->GetCryptohomeLibrary()->IsMounted());
     }
     logged_in_ = true;
   }
 #endif
@@ skipping 240 matching lines @@
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_cache) {
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }