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

chrome/browser/extensions/activity_log/activity_database_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 <stddef.h>
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 14 matching lines @@
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_browser_thread.h"
 #include "extensions/common/dom_action_types.h"
 #include "sql/statement.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
-#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"
 #include "chromeos/chromeos_switches.h"
 #endif
 
 using content::BrowserThread;
 
 namespace constants = activity_log_constants;
 
 namespace extensions {
@@ skipping 60 matching lines @@
 void ActivityDatabaseTestPolicy::Record(ActivityDatabase* db,
                                         scoped_refptr<Action> action) {
   queue_.push_back(action);
   db->AdviseFlush(queue_.size());
 }
 
 class ActivityDatabaseTest : public ChromeRenderViewHostTestHarness {
  protected:
   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);
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         switches::kEnableExtensionActivityLogTesting);
   }
 
   void TearDown() override {
-#if defined OS_CHROMEOS
-    test_user_manager_.reset();
-#endif
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   // Creates a test database and initializes the table schema.
   ActivityDatabase* OpenDatabase(const base::FilePath& db_file) {
     db_delegate_ = new ActivityDatabaseTestPolicy();
     ActivityDatabase* activity_db = new ActivityDatabase(db_delegate_);
     activity_db->Init(db_file);
     CHECK(activity_db->is_db_valid());
     return activity_db;
@@ skipping 21 matching lines @@
     statement.BindString(0, api_name_pattern);
     if (!statement.Step())
       return -1;
     return statement.ColumnInt(0);
   }
 
  private:
 #if defined OS_CHROMEOS
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  std::unique_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
 #endif
 
   ActivityDatabaseTestPolicy* db_delegate_;
 };
 
 // Check that the database is initialized properly.
 TEST_F(ActivityDatabaseTest, Init) {
   base::ScopedTempDir temp_dir;
   base::FilePath db_file;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
@@ skipping 101 matching lines @@
   ActivityDatabaseTestPolicy* delegate = new ActivityDatabaseTestPolicy();
   ActivityDatabase* activity_db = new ActivityDatabase(delegate);
   scoped_refptr<Action> action = new Action(
       "punky", base::Time::Now(), Action::ACTION_API_CALL, "brewster");
   action->mutable_args()->AppendString("woof");
   delegate->Record(activity_db, action);
   activity_db->Close();
 }
 
 }  // namespace extensions