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

chrome/browser/chromeos/extensions/active_tab_permission_granter_delegate_chromeos_unittest.cc

 // Copyright 2017 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/chromeos/extensions/active_tab_permission_granter_delegate_chromeos.h"
 
-#include <memory>
 #include <string>
 
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/extensions/public_session_permission_helper.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chromeos/login/scoped_test_public_session_login_state.h"
 #include "extensions/browser/extension_dialog_auto_confirm.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
@@ skipping 17 matching lines @@
 
 }  // namespace
 
 class ActiveTabPermissionGranterDelegateChromeOSTest
     : public ChromeRenderViewHostTestHarness {
  protected:
   void SetUp() override;
   void TearDown() override;
 
   ActiveTabPermissionGranterDelegateChromeOS delegate_;
-  std::unique_ptr<chromeos::ScopedTestPublicSessionLoginState> login_state_;
+  chromeos::ScopedTestPublicSessionLoginState login_state_;
 };
 
 void ActiveTabPermissionGranterDelegateChromeOSTest::SetUp() {
   ChromeRenderViewHostTestHarness::SetUp();
-  login_state_.reset(new chromeos::ScopedTestPublicSessionLoginState());
 }
 
 void ActiveTabPermissionGranterDelegateChromeOSTest::TearDown() {
-  login_state_.reset();
   permission_helper::ResetPermissionsForTesting();
   ChromeRenderViewHostTestHarness::TearDown();
 }
 
 TEST_F(ActiveTabPermissionGranterDelegateChromeOSTest, GrantedForWhitelisted) {
   auto extension = CreateExtension(kWhitelistedId);
   EXPECT_TRUE(delegate_.ShouldGrantActiveTab(extension.get(), nullptr));
 }
 
 TEST_F(ActiveTabPermissionGranterDelegateChromeOSTest,
@@ skipping 14 matching lines @@
   auto extension = CreateExtension(kNonWhitelistedId);
   // Allow the permission request.
   ScopedTestDialogAutoConfirm auto_confirm(ScopedTestDialogAutoConfirm::ACCEPT);
   EXPECT_FALSE(delegate_.ShouldGrantActiveTab(extension.get(), nullptr));
   base::RunLoop().RunUntilIdle();
   // The permission request is granted now.
   EXPECT_TRUE(delegate_.ShouldGrantActiveTab(extension.get(), nullptr));
 }
 
 }  // namespace extensions