Revert of ChromeOS: Per-user time zone: refactor tests first.

chrome/browser/extensions/test_extension_system.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/extensions/test_extension_system.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
@@ skipping 10 matching lines @@
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/browser/info_map.h"
 #include "extensions/browser/management_policy.h"
 #include "extensions/browser/quota_service.h"
 #include "extensions/browser/runtime_data.h"
 #include "extensions/browser/state_store.h"
 #include "extensions/browser/value_store/test_value_store_factory.h"
 #include "extensions/browser/value_store/testing_value_store.h"
-#if defined(OS_CHROMEOS)
-#include "components/user_manager/user_manager.h"
-#endif
 
 using content::BrowserThread;
 
 namespace extensions {
 
 TestExtensionSystem::TestExtensionSystem(Profile* profile)
     : profile_(profile),
       store_factory_(new TestValueStoreFactory()),
       info_map_(new InfoMap()),
       quota_service_(new QuotaService()),
-      app_sorting_(new ChromeAppSorting(profile_)) {
-#if defined(OS_CHROMEOS)
-  if (!user_manager::UserManager::IsInitialized())
-    test_user_manager_.reset(new chromeos::ScopedTestUserManager);
-#endif
-}
+      app_sorting_(new ChromeAppSorting(profile_)) {}
 
 TestExtensionSystem::~TestExtensionSystem() {
 }
 
 void TestExtensionSystem::Shutdown() {
   if (extension_service_)
     extension_service_->Shutdown();
 }
 
 ExtensionService* TestExtensionSystem::CreateExtensionService(
@@ skipping 92 matching lines @@
     content::BrowserContext* profile) {
   return base::WrapUnique(
       new TestExtensionSystem(static_cast<Profile*>(profile)));
 }
 
 void TestExtensionSystem::RecreateAppSorting() {
   app_sorting_.reset(new ChromeAppSorting(profile_));
 }
 
 }  // namespace extensions