Revert 170507 - Add public accounts to UserManager

chrome/browser/chromeos/login/user_manager_unittest.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 <cstdlib>
 #include <cstring>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/mock_cert_library.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/user_manager_impl.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
 #include "chrome/browser/chromeos/settings/cros_settings_provider.h"
-#include "chrome/browser/chromeos/settings/device_settings_service.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using ::testing::AnyNumber;
 
 namespace chromeos {
@@ skipping 43 matching lines @@
     // Unregister the in-memory local settings instance.
     reinterpret_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(0);
 
     // Restore the real DeviceSettingsProvider.
     EXPECT_TRUE(
       cros_settings_->RemoveSettingsProvider(&stub_settings_provider_));
     cros_settings_->AddSettingsProvider(device_settings_provider_);
 
     UserManager::Set(old_user_manager_);
-
-    // Shut down the DeviceSettingsService.
-    DeviceSettingsService::Get()->Shutdown();
-
-    // Shut down the remaining UserManager instances.
-    if (user_manager_impl)
-      user_manager_impl->Shutdown();
-    UserManager::Get()->Shutdown();
   }
 
   bool GetUserManagerEphemeralUsersEnabled() const {
     return reinterpret_cast<UserManagerImpl*>(UserManager::Get())->
         ephemeral_users_enabled_;
   }
 
   void SetUserManagerEphemeralUsersEnabled(bool ephemeral_users_enabled) {
     reinterpret_cast<UserManagerImpl*>(UserManager::Get())->
         ephemeral_users_enabled_ = ephemeral_users_enabled;
   }
 
   const std::string& GetUserManagerOwnerEmail() const {
     return reinterpret_cast<UserManagerImpl*>(UserManager::Get())->
         owner_email_;
   }
 
   void SetUserManagerOwnerEmail(const std::string& owner_email) {
     reinterpret_cast<UserManagerImpl*>(UserManager::Get())->
         owner_email_ = owner_email;
   }
 
   void ResetUserManager() {
-    if (user_manager_impl)
-      user_manager_impl->Shutdown();
     user_manager_impl.reset(new UserManagerImpl());
     UserManager::Set(user_manager_impl.get());
   }
 
   void SetDeviceSettings(bool ephemeral_users_enabled,
                          const std::string &owner) {
     base::FundamentalValue
         ephemeral_users_enabled_value(ephemeral_users_enabled);
     stub_settings_provider_.Set(kAccountsPrefEphemeralUsersEnabled,
         ephemeral_users_enabled_value);
@@ skipping 64 matching lines @@
   ResetUserManager();
   UserManager::Get()->UserLoggedIn("user0@invalid.domain", true);
   ResetUserManager();
 
   const UserList* users = &UserManager::Get()->GetUsers();
   EXPECT_TRUE(users->size() == 1);
   EXPECT_EQ((*users)[0]->email(), "owner@invalid.domain");
 }
 
 }  // namespace chromeos