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

chrome/browser/extensions/test_extension_system.cc

Index: chrome/browser/extensions/test_extension_system.cc
diff --git a/chrome/browser/extensions/test_extension_system.cc b/chrome/browser/extensions/test_extension_system.cc
index f775635d75adb62437958661febc2c486b127da3..e0453fecc1ae0f61bba56dca482d24ab3d8f8d4e 100644
--- a/chrome/browser/extensions/test_extension_system.cc
+++ b/chrome/browser/extensions/test_extension_system.cc
@@ -28,6 +28,9 @@
 #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;
 
@@ -38,7 +41,12 @@ TestExtensionSystem::TestExtensionSystem(Profile* profile)
       store_factory_(new TestValueStoreFactory()),
       info_map_(new InfoMap()),
       quota_service_(new QuotaService()),
-      app_sorting_(new ChromeAppSorting(profile_)) {}
+      app_sorting_(new ChromeAppSorting(profile_)) {
+#if defined(OS_CHROMEOS)
+  if (!user_manager::UserManager::IsInitialized())
+    test_user_manager_.reset(new chromeos::ScopedTestUserManager);
+#endif
+}
 
 TestExtensionSystem::~TestExtensionSystem() {
 }