Eliminate CrosLibrary::EnsureLoaded

chrome/browser/chromeos/extensions/file_browser_event_router.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 "chrome/browser/chromeos/extensions/file_browser_event_router.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/stl_util.h"
@@ skipping 77 matching lines @@
 
 ExtensionFileBrowserEventRouter::~ExtensionFileBrowserEventRouter() {
   DCHECK(file_watchers_.empty());
   STLDeleteValues(&file_watchers_);
 
   if (!profile_) {
     NOTREACHED();
     return;
   }
   profile_ = NULL;
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
-    return;
   chromeos::MountLibrary* lib =
       chromeos::CrosLibrary::Get()->GetMountLibrary();
   lib->RemoveObserver(this);
 }
 
 void ExtensionFileBrowserEventRouter::ObserveFileSystemEvents() {
   if (!profile_) {
     NOTREACHED();
     return;
   }
-  if (!chromeos::CrosLibrary::Get()->EnsureLoaded())
-    return;
   if (chromeos::UserManager::Get()->user_is_logged_in()) {
     chromeos::MountLibrary* lib =
         chromeos::CrosLibrary::Get()->GetMountLibrary();
     lib->RemoveObserver(this);
     lib->AddObserver(this);
     lib->RequestMountInfoRefresh();
   }
 }
 
 // File watch setup routines.
@@ skipping 398 matching lines @@
 
 const FilePath&
 ExtensionFileBrowserEventRouter::FileWatcherExtensions::GetVirtualPath() const {
   return virtual_path;
 }
 
 bool ExtensionFileBrowserEventRouter::FileWatcherExtensions::Watch
     (const FilePath& path, FileWatcherDelegate* delegate) {
   return file_watcher->Watch(path, delegate);
 }