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

chrome/browser/extensions/activity_log/activity_log_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 "chrome/browser/extensions/activity_log/activity_log.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 16 matching lines @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/dom_action_types.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/test_util.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
 
 namespace {
 
 const char kExtensionId[] = "abc";
 
 const char* const kUrlApiCalls[] = {
     "HTMLButtonElement.formAction", "HTMLEmbedElement.src",
@@ skipping 10 matching lines @@
 
 }  // namespace
 
 namespace extensions {
 
 class ActivityLogTest : public ChromeRenderViewHostTestHarness {
  protected:
   virtual bool enable_activity_logging_switch() const { return true; }
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
-#if defined OS_CHROMEOS
-    test_user_manager_.reset(new chromeos::ScopedTestUserManager());
-#endif
     base::CommandLine command_line(base::CommandLine::NO_PROGRAM);
     if (enable_activity_logging_switch()) {
       base::CommandLine::ForCurrentProcess()->AppendSwitch(
           switches::kEnableExtensionActivityLogging);
     }
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
     extension_service_ = static_cast<TestExtensionSystem*>(
         ExtensionSystem::Get(profile()))->CreateExtensionService
             (&command_line, base::FilePath(), false);
     base::RunLoop().RunUntilIdle();
   }
 
   void TearDown() override {
-#if defined OS_CHROMEOS
-    test_user_manager_.reset();
-#endif
     base::RunLoop().RunUntilIdle();
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   static void RetrieveActions_LogAndFetchActions0(
       std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
     ASSERT_EQ(0, static_cast<int>(i->size()));
   }
 
   static void RetrieveActions_LogAndFetchActions2(
@@ skipping 97 matching lines @@
           other->GetInteger(activity_log_constants::kActionDomVerb, &dom_verb));
       ASSERT_EQ(DomActionType::SETTER, dom_verb);
     }
   }
 
   ExtensionService* extension_service_;
 
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 };
 
 TEST_F(ActivityLogTest, Construct) {
   ASSERT_TRUE(GetDatabaseEnabled());
   ASSERT_FALSE(GetWatchdogActive());
 }
 
 TEST_F(ActivityLogTest, LogAndFetchActions) {
   ActivityLog* activity_log = ActivityLog::GetInstance(profile());
@@ skipping 231 matching lines @@
   EXPECT_TRUE(activity_log->ShouldLog(empty_extension->id()));
   // ... but not those of the watchdog app.
   EXPECT_FALSE(activity_log->ShouldLog(activity_log_extension->id()));
   extension_service_->DisableExtension(activity_log_extension->id(),
                                        Extension::DISABLE_USER_ACTION);
   // Disabling the watchdog app means that we're back to never logging anything.
   EXPECT_FALSE(activity_log->ShouldLog(empty_extension->id()));
 }
 
 }  // namespace extensions