Revert 170507 - Add public accounts to UserManager

chrome/browser/chromeos/settings/device_settings_service.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/settings/device_settings_service.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
   session_manager_client_->AddObserver(this);
 
   StartNextOperation();
 }
 
 void DeviceSettingsService::Shutdown() {
   STLDeleteContainerPointers(pending_operations_.begin(),
                              pending_operations_.end());
   pending_operations_.clear();
 
-  if (session_manager_client_)
-    session_manager_client_->RemoveObserver(this);
+  session_manager_client_->RemoveObserver(this);
   session_manager_client_ = NULL;
   owner_key_util_ = NULL;
 }
 
 scoped_refptr<OwnerKey> DeviceSettingsService::GetOwnerKey() {
   return owner_key_;
 }
 
 void DeviceSettingsService::Load() {
   EnqueueLoad(false);
@@ skipping 192 matching lines @@
 
   // Only remove the pending operation here, so new operations triggered by any
   // of the callbacks above are queued up properly.
   pending_operations_.pop_front();
   delete operation;
 
   StartNextOperation();
 }
 
 }  // namespace chromeos