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

chrome/browser/media_galleries/media_file_system_registry_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.
 
 // MediaFileSystemRegistry unit tests.
 
 #include "chrome/browser/media_galleries/media_file_system_registry.h"
 
 #include <stddef.h>
 
@@ skipping 34 matching lines @@
 #include "content/public/browser/render_process_host_factory.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/mock_render_process_host.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
+#include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
 #endif
 
 using content::BrowserThread;
 using storage_monitor::StorageInfo;
 using storage_monitor::StorageMonitor;
 using storage_monitor::TestStorageMonitor;
 
 // Not anonymous so it can be friends with MediaFileSystemRegistry.
@@ skipping 306 matching lines @@
   base::FilePath dcim_dir_;
 
   // MediaFileSystemRegistry owns this.
   TestMediaFileSystemContext* test_file_system_context_;
 
   // Needed for extension service & friends to work.
 
 #if defined(OS_CHROMEOS)
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
+  std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
   MockProfileSharedRenderProcessHostFactory rph_factory_;
 
   std::vector<std::unique_ptr<ProfileState>> profile_states_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaFileSystemRegistryTest);
 };
 
 namespace {
@@ skipping 377 matching lines @@
 void MediaFileSystemRegistryTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
   ASSERT_TRUE(TestStorageMonitor::CreateAndInstall());
 
   DeleteContents();
   SetRenderProcessHostFactory(&rph_factory_);
 
   test_file_system_context_ = new TestMediaFileSystemContext(
       g_browser_process->media_file_system_registry());
 
+#if defined(OS_CHROMEOS)
+  test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
+
   ASSERT_TRUE(galleries_dir_.CreateUniqueTempDir());
   empty_dir_ = galleries_dir_.GetPath().AppendASCII("empty");
   ASSERT_TRUE(base::CreateDirectory(empty_dir_));
   dcim_dir_ = galleries_dir_.GetPath().AppendASCII("with_dcim");
   ASSERT_TRUE(base::CreateDirectory(dcim_dir_));
   ASSERT_TRUE(base::CreateDirectory(
       dcim_dir_.Append(storage_monitor::kDCIMDirectoryName)));
 }
 
 void MediaFileSystemRegistryTest::TearDown() {
   profile_states_.clear();
   MediaFileSystemRegistry* registry =
       g_browser_process->media_file_system_registry();
   EXPECT_EQ(0U, GetExtensionGalleriesHostCount(registry));
 
+#if defined(OS_CHROMEOS)
+  test_user_manager_.reset();
+#endif
+
   // The TestingProfile must be destroyed before the TestingBrowserProcess
   // because it uses it in its destructor.
   ChromeRenderViewHostTestHarness::TearDown();
 
   // The MediaFileSystemRegistry owned by the TestingBrowserProcess must be
   // destroyed before the StorageMonitor because it calls
   // StorageMonitor::RemoveObserver() in its destructor.
   TestingBrowserProcess::DeleteInstance();
 
   TestStorageMonitor::Destroy();
@@ skipping 272 matching lines @@
       fs_info.begin()->second.fsid).empty());
 
   // Revoke permission and ensure that the file system is revoked.
   SetGalleryPermission(profile_state,
                        profile_state->regular_permission_extension(),
                        device_id,
                        false /*has access*/);
   EXPECT_TRUE(test_file_system_context()->GetRegisteredPath(
       fs_info.begin()->second.fsid).empty());
 }