Remove ash::ShellContentState

Update the last few tests that used it to pass the browser context
around in other ways.

TBR=sky@chromium.org

Bug: 826374
Change-Id: Ic6de0e33b8ccc20ab84a0dcf8309cc103595f5f5
Reviewed-on: https://chromium-review.googlesource.com/1112666
Commit-Queue: Evan Stade <estade@chromium.org>
Reviewed-by: James Cook <jamescook@chromium.org>
Cr-Commit-Position: refs/heads/master@{#569902}

ash/BUILD.gn

@@ -1456,8 +1456,6 @@ component("ash_with_content") {
     "content/keyboard_overlay/keyboard_overlay_view.h",
     "content/screen_orientation_delegate_chromeos.cc",
     "content/screen_orientation_delegate_chromeos.h",
-    "content/shell_content_state.cc",
-    "content/shell_content_state.h",
   ]
 
   defines = [ "ASH_WITH_CONTENT_IMPLEMENTATION" ]
@@ -1555,8 +1553,6 @@ static_library("ash_shell_lib_with_content") {
     "shell/content/client/shell_content_browser_client.h",
     "shell/content/client/shell_main_delegate.cc",
     "shell/content/client/shell_main_delegate.h",
-    "shell/content/shell_content_state_impl.cc",
-    "shell/content/shell_content_state_impl.h",
   ]
 
   deps = [
@@ -2121,8 +2117,6 @@ static_library("test_support_with_content") {
   sources = [
     "test/ash_test_environment_content.cc",
     "test/ash_test_environment_content.h",
-    "test/content/test_shell_content_state.cc",
-    "test/content/test_shell_content_state.h",
   ]
   configs += [ "//build/config:precompiled_headers" ]
 

ash/content/display/screen_orientation_controller_chromeos_unittest.cc

@@ -8,7 +8,6 @@
 #include <vector>
 
 #include "ash/content/screen_orientation_delegate_chromeos.h"
-#include "ash/content/shell_content_state.h"
 #include "ash/display/screen_orientation_controller.h"
 #include "ash/display/screen_orientation_controller_test_api.h"
 #include "ash/public/cpp/app_types.h"
@@ -18,7 +17,6 @@
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_environment_content.h"
 #include "ash/test/ash_test_helper.h"
-#include "ash/test/content/test_shell_content_state.h"
 #include "ash/test_shell_delegate.h"
 #include "ash/wm/tablet_mode/tablet_mode_controller.h"
 #include "ash/wm/window_state.h"
@@ -153,6 +151,8 @@ class ScreenOrientationControllerTest : public AshTestBase {
  private:
   ScreenOrientationDelegateChromeos delegate_;
 
+  content::TestBrowserContext browser_context_;
+
   // Optional content::BrowserContext used for two window tests.
   std::unique_ptr<content::BrowserContext> secondary_browser_context_;
 
@@ -171,8 +171,8 @@ ScreenOrientationControllerTest::~ScreenOrientationControllerTest() = default;
 
 std::unique_ptr<content::WebContents>
 ScreenOrientationControllerTest::CreateWebContents() {
-  return content::WebContentsTester::CreateTestWebContents(
-      ShellContentState::GetInstance()->GetActiveBrowserContext(), nullptr);
+  return content::WebContentsTester::CreateTestWebContents(&browser_context_,
+                                                           nullptr);
 }
 
 std::unique_ptr<content::WebContents>

ash/content/keyboard_overlay/DEPS

 include_rules = [
   "+content/public/browser",
 ]
+specific_include_rules = {
+  ".*test\.cc": [
+    "+content/public/test/test_browser_context.h",
+  ],
+}

ash/content/keyboard_overlay/keyboard_overlay_view_unittest.cc

@@ -7,10 +7,10 @@
 #include <algorithm>
 
 #include "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
-#include "ash/content/shell_content_state.h"
 #include "ash/public/cpp/accelerators.h"
 #include "ash/test/ash_test_base.h"
 #include "base/stl_util.h"
+#include "content/public/test/test_browser_context.h"
 #include "ui/web_dialogs/test/test_web_contents_handler.h"
 #include "ui/web_dialogs/test/test_web_dialog_delegate.h"
 
@@ -26,9 +26,9 @@ bool operator==(const KeyboardOverlayView::KeyEventData& lhs,
 // Verifies that the accelerators that open the keyboard overlay close it.
 TEST_F(KeyboardOverlayViewTest, OpenAcceleratorsClose) {
   ui::test::TestWebDialogDelegate delegate(GURL("chrome://keyboardoverlay"));
-  KeyboardOverlayView view(
-      ShellContentState::GetInstance()->GetActiveBrowserContext(), &delegate,
-      new ui::test::TestWebContentsHandler);
+  content::TestBrowserContext browser_context;
+  KeyboardOverlayView view(&browser_context, &delegate,
+                           new ui::test::TestWebContentsHandler);
   for (size_t i = 0; i < kAcceleratorDataLength; ++i) {
     if (kAcceleratorData[i].action != SHOW_KEYBOARD_OVERLAY)
       continue;
@@ -45,9 +45,9 @@ TEST_F(KeyboardOverlayViewTest, OpenAcceleratorsClose) {
 // canceling key.
 TEST_F(KeyboardOverlayViewTest, TestCancelingKeysWithNonModifierFlags) {
   ui::test::TestWebDialogDelegate delegate(GURL("chrome://keyboardoverlay"));
-  KeyboardOverlayView view(
-      ShellContentState::GetInstance()->GetActiveBrowserContext(), &delegate,
-      new ui::test::TestWebContentsHandler);
+  content::TestBrowserContext browser_context;
+  KeyboardOverlayView view(&browser_context, &delegate,
+                           new ui::test::TestWebContentsHandler);
 
   const int kNonModifierFlags = ui::EF_IS_SYNTHESIZED | ui::EF_NUM_LOCK_ON |
                                 ui::EF_IME_FABRICATED_KEY | ui::EF_IS_REPEAT;

ash/content/shell_content_state.cc

-// Copyright 2015 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 "ash/content/shell_content_state.h"
-
-#include "base/logging.h"
-#include "ui/keyboard/keyboard_resource_util.h"
-
-namespace ash {
-
-// static
-ShellContentState* ShellContentState::instance_ = nullptr;
-
-// static
-void ShellContentState::SetInstance(ShellContentState* instance) {
-  DCHECK(!instance_);
-  instance_ = instance;
-}
-
-// static
-ShellContentState* ShellContentState::GetInstance() {
-  DCHECK(instance_);
-  return instance_;
-}
-
-// static
-void ShellContentState::DestroyInstance() {
-  DCHECK(instance_);
-  delete instance_;
-  instance_ = nullptr;
-}
-
-ShellContentState::ShellContentState() {
-  // The keyboard system must be initialized before the RootWindowController is
-  // created.
-  keyboard::InitializeKeyboardResources();
-}
-
-ShellContentState::~ShellContentState() = default;
-
-}  // namespace ash

ash/content/shell_content_state.h

-// Copyright 2015 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.
-
-#ifndef ASH_CONTENT_SHELL_CONTENT_STATE_H_
-#define ASH_CONTENT_SHELL_CONTENT_STATE_H_
-
-#include "ash/content/ash_with_content_export.h"
-#include "ash/public/cpp/session_types.h"
-#include "base/macros.h"
-
-
-namespace aura {
-class Window;
-}
-
-namespace content {
-class BrowserContext;
-}
-
-namespace ash {
-
-class ASH_WITH_CONTENT_EXPORT ShellContentState {
- public:
-  static void SetInstance(ShellContentState* state);
-  static ShellContentState* GetInstance();
-  static void DestroyInstance();
-
-  // Provides the embedder a way to return an active browser context for the
-  // current user scenario. Default implementation here returns nullptr.
-  virtual content::BrowserContext* GetActiveBrowserContext() = 0;
-
- protected:
-  ShellContentState();
-  virtual ~ShellContentState();
-
- private:
-  static ShellContentState* instance_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellContentState);
-};
-
-}  // namespace ash
-
-#endif  // ASH_CONTENT_SHELL_CONTENT_STATE_H_

ash/shell/content/client/shell_browser_main_parts.cc

@@ -11,11 +11,9 @@
 #include "ash/components/shortcut_viewer/public/mojom/shortcut_viewer.mojom.h"
 #include "ash/components/tap_visualizer/public/mojom/constants.mojom.h"
 #include "ash/content/content_gpu_interface_provider.h"
-#include "ash/content/shell_content_state.h"
 #include "ash/login_status.h"
 #include "ash/public/cpp/ash_features.h"
 #include "ash/shell.h"
-#include "ash/shell/content/shell_content_state_impl.h"
 #include "ash/shell/example_session_controller_client.h"
 #include "ash/shell/shell_delegate_impl.h"
 #include "ash/shell/shell_views_delegate.h"
@@ -89,8 +87,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
   chromeos::PowerPolicyController::Initialize(
       chromeos::DBusThreadManager::Get()->GetPowerManagerClient());
 
-  ShellContentState::SetInstance(
-      new ShellContentStateImpl(browser_context_.get()));
   ui::MaterialDesignController::Initialize();
   ash::ShellInitParams init_params;
   init_params.shell_port = std::make_unique<ash::ShellPortClassic>();
@@ -112,8 +108,7 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 
   ash::shell::InitWindowTypeLauncher(base::Bind(
       &views::examples::ShowExamplesWindowWithContent,
-      views::examples::DO_NOTHING_ON_CLOSE,
-      ShellContentState::GetInstance()->GetActiveBrowserContext(), nullptr));
+      views::examples::DO_NOTHING_ON_CLOSE, browser_context_.get(), nullptr));
 
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 
@@ -139,7 +134,6 @@ void ShellBrowserMainParts::PreMainMessageLoopRun() {
 void ShellBrowserMainParts::PostMainMessageLoopRun() {
   window_watcher_.reset();
   ash::Shell::DeleteInstance();
-  ShellContentState::DestroyInstance();
 
   chromeos::CrasAudioHandler::Shutdown();
 

ash/shell/content/shell_content_state_impl.cc

-// Copyright 2015 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 "ash/shell/content/shell_content_state_impl.h"
-
-#include "content/public/browser/browser_context.h"
-
-namespace ash {
-
-ShellContentStateImpl::ShellContentStateImpl(content::BrowserContext* context)
-    : browser_context_(context) {}
-ShellContentStateImpl::~ShellContentStateImpl() = default;
-
-content::BrowserContext* ShellContentStateImpl::GetActiveBrowserContext() {
-  return browser_context_;
-}
-
-}  // namespace ash

ash/shell/content/shell_content_state_impl.h

-// Copyright 2015 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.
-
-#ifndef ASH_SHELL_CONTENT_SHELL_CONTENT_STATE_IMPL_H_
-#define ASH_SHELL_CONTENT_SHELL_CONTENT_STATE_IMPL_H_
-
-#include "ash/content/shell_content_state.h"
-#include "base/macros.h"
-
-namespace ash {
-
-class ShellContentStateImpl : public ShellContentState {
- public:
-  explicit ShellContentStateImpl(content::BrowserContext* context);
-
- private:
-  ~ShellContentStateImpl() override;
-
-  // Overridden from ShellContentState:
-  content::BrowserContext* GetActiveBrowserContext() override;
-
-  content::BrowserContext* browser_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellContentStateImpl);
-};
-
-}  // namespace ash
-
-#endif  // ASH_SHELL_CONTENT_SHELL_CONTENT_STATE_IMPL_H_

ash/test/DEPS

@@ -11,7 +11,6 @@ specific_include_rules = {
     "+content/public/browser/browser_thread.h",
     "+content/public/test/web_contents_tester.h",
     "+content/public/test/test_browser_thread_bundle.h",
-    "+content/public/test/test_browser_context.h",
   ],
   "ash_test_helper\.cc": [
     "+ash/host",

ash/test/ash_test_environment_content.cc

@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "ash/test/ash_test_views_delegate.h"
-#include "ash/test/content/test_shell_content_state.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/web_contents_tester.h"
 
@@ -38,20 +37,13 @@ AshTestEnvironmentContent::AshTestEnvironmentContent()
 AshTestEnvironmentContent::~AshTestEnvironmentContent() = default;
 
 void AshTestEnvironmentContent::SetUp() {
-  ShellContentState* content_state = content_state_;
-  if (!content_state) {
-    test_shell_content_state_ = new TestShellContentState;
-    content_state = test_shell_content_state_;
-  }
   scoped_web_contents_creator_ =
       std::make_unique<views::WebView::ScopedWebContentsCreatorForTesting>(
           base::BindRepeating(&CreateWebContents));
-  ShellContentState::SetInstance(content_state);
 }
 
 void AshTestEnvironmentContent::TearDown() {
   scoped_web_contents_creator_.reset();
-  ShellContentState::DestroyInstance();
 }
 
 std::unique_ptr<AshTestViewsDelegate>

ash/test/ash_test_environment_content.h

@@ -15,8 +15,6 @@ class TestBrowserThreadBundle;
 
 namespace ash {
 
-class ShellContentState;
-class TestShellContentState;
 
 // AshTestEnvironment implementation for tests that use content.
 class AshTestEnvironmentContent : public AshTestEnvironment {
@@ -24,13 +22,6 @@ class AshTestEnvironmentContent : public AshTestEnvironment {
   AshTestEnvironmentContent();
   ~AshTestEnvironmentContent() override;
 
-  TestShellContentState* test_shell_content_state() {
-    return test_shell_content_state_;
-  }
-  void set_content_state(ShellContentState* content_state) {
-    content_state_ = content_state;
-  }
-
   // AshTestEnvironment:
   void SetUp() override;
   void TearDown() override;
@@ -41,15 +32,6 @@ class AshTestEnvironmentContent : public AshTestEnvironment {
   std::unique_ptr<views::WebView::ScopedWebContentsCreatorForTesting>
       scoped_web_contents_creator_;
 
-  // An implementation of ShellContentState supplied by the user prior to
-  // SetUp().
-  ShellContentState* content_state_ = nullptr;
-
-  // If |content_state_| is not set prior to SetUp(), this value will be
-  // set to an instance of TestShellContentState created by this class. If
-  // |content_state_| is non-null, this will be nullptr.
-  TestShellContentState* test_shell_content_state_ = nullptr;
-
   DISALLOW_COPY_AND_ASSIGN(AshTestEnvironmentContent);
 };
 

ash/test/content/test_shell_content_state.cc

-// Copyright 2015 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 "ash/test/content/test_shell_content_state.h"
-
-#include "content/public/test/test_browser_context.h"
-
-namespace ash {
-
-TestShellContentState::TestShellContentState() = default;
-TestShellContentState::~TestShellContentState() = default;
-
-content::BrowserContext* TestShellContentState::GetActiveBrowserContext() {
-  active_browser_context_.reset(new content::TestBrowserContext());
-  return active_browser_context_.get();
-}
-
-}  // namespace ash

ash/test/content/test_shell_content_state.h

-// Copyright 2015 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.
-
-#ifndef ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
-#define ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_
-
-#include <memory>
-
-#include "ash/content/shell_content_state.h"
-#include "base/macros.h"
-
-namespace content {
-class BrowserContext;
-}
-
-namespace ash {
-
-class TestShellContentState : public ShellContentState {
- public:
-  TestShellContentState();
-
- private:
-  ~TestShellContentState() override;
-
-  // Overridden from ShellContentState:
-  content::BrowserContext* GetActiveBrowserContext() override;
-
-  std::unique_ptr<content::BrowserContext> active_browser_context_;
-
-  DISALLOW_COPY_AND_ASSIGN(TestShellContentState);
-};
-
-}  // namespace ash
-
-#endif  // ASH_TEST_CONTENT_TEST_SHELL_CONTENT_STATE_H_

chrome/browser/ui/BUILD.gn

@@ -1787,8 +1787,6 @@ split_static_library("ui") {
       "ash/chrome_screenshot_grabber.cc",
       "ash/chrome_screenshot_grabber.h",
       "ash/chrome_screenshot_grabber_test_observer.h",
-      "ash/chrome_shell_content_state.cc",
-      "ash/chrome_shell_content_state.h",
       "ash/chrome_shell_delegate.cc",
       "ash/chrome_shell_delegate.h",
       "ash/ime_controller_client.cc",

chrome/browser/ui/ash/DEPS

@@ -51,10 +51,6 @@ specific_include_rules = {
     "+ash/screenshot_delegate.h",
     "+ash/shell.h",
   ],
-  # https://crbug.com/672277
-  "chrome_shell_content_state\.h": [
-    "+ash/content/shell_content_state.h",
-  ],
   # https://crbug.com/665064
   "chrome_shell_delegate.*": [
     # https://crbug.com/756054
@@ -63,10 +59,6 @@ specific_include_rules = {
     "+ash/screenshot_delegate.h",
     "+ash/shell_delegate.h",
   ],
-  # https://crbug.com/672277
-  "session_util\.cc": [
-    "+ash/content/shell_content_state.h",
-  ],
   # For ash::Shell::GetContainer (!mash)
   "system_tray_client\.cc": [
     "+ash/shell.h",

chrome/browser/ui/ash/ash_shell_init.cc

@@ -13,7 +13,6 @@
 #include "ash/shell_port_classic.h"
 #include "ash/window_manager.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/chrome_shell_delegate.h"
 #include "content/public/browser/context_factory.h"
 
@@ -49,13 +48,10 @@ void AshShellInit::RegisterDisplayPrefs(PrefRegistrySimple* registry) {
 }
 
 AshShellInit::AshShellInit() {
-  // Balanced by a call to DestroyInstance() below.
-  ash::ShellContentState::SetInstance(new ChromeShellContentState);
   CreateClassicShell();
   ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
 }
 
 AshShellInit::~AshShellInit() {
   ash::Shell::DeleteInstance();
-  ash::ShellContentState::DestroyInstance();
 }

chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.cc

@@ -26,7 +26,6 @@
 #include "chrome/browser/ui/ash/ash_shell_init.h"
 #include "chrome/browser/ui/ash/cast_config_client_media_router.h"
 #include "chrome/browser/ui/ash/chrome_new_window_client.h"
-#include "chrome/browser/ui/ash/chrome_shell_content_state.h"
 #include "chrome/browser/ui/ash/ime_controller_client.h"
 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 #include "chrome/browser/ui/ash/login_screen_client.h"
@@ -237,9 +236,6 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {
 }
 
 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
-  if (!features::IsAshInBrowserProcess())
-    chrome_shell_content_state_ = std::make_unique<ChromeShellContentState>();
-
   cast_config_client_media_router_ =
       std::make_unique<CastConfigClientMediaRouter>();
   login_screen_client_ = std::make_unique<LoginScreenClient>();

chrome/browser/ui/ash/chrome_browser_main_extra_parts_ash.h

@@ -29,7 +29,6 @@ class AppListClientImpl;
 class AshShellInit;
 class CastConfigClientMediaRouter;
 class ChromeNewWindowClient;
-class ChromeShellContentState;
 class DataPromoNotification;
 class ImeControllerClient;
 class ImmersiveContextMus;
@@ -119,9 +118,6 @@ class ChromeBrowserMainExtraPartsAsh : public ChromeBrowserMainExtraParts {
   std::unique_ptr<AssistantClient> assistant_client_;
 #endif
 
-  // Initialized in PostProfileInit if ash config == MASH:
-  std::unique_ptr<ChromeShellContentState> chrome_shell_content_state_;
-
   // Initialized in PostProfileInit in all configs:
   std::unique_ptr<CastConfigClientMediaRouter> cast_config_client_media_router_;
   std::unique_ptr<LoginScreenClient> login_screen_client_;

chrome/browser/ui/ash/chrome_shell_content_state.cc

-// Copyright 2015 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/ui/ash/chrome_shell_content_state.h"
-
-#include "chrome/browser/profiles/profile_manager.h"
-#include "content/public/browser/browser_context.h"
-
-namespace {
-
-ChromeShellContentState* g_chrome_shell_content_state_instance = nullptr;
-
-}  // namespace
-
-// static
-ChromeShellContentState* ChromeShellContentState::GetInstance() {
-  DCHECK(g_chrome_shell_content_state_instance);
-  return g_chrome_shell_content_state_instance;
-}
-
-ChromeShellContentState::ChromeShellContentState() {
-  DCHECK(!g_chrome_shell_content_state_instance);
-  g_chrome_shell_content_state_instance = this;
-}
-
-ChromeShellContentState::~ChromeShellContentState() {
-  DCHECK_EQ(this, g_chrome_shell_content_state_instance);
-  g_chrome_shell_content_state_instance = nullptr;
-}
-
-content::BrowserContext* ChromeShellContentState::GetActiveBrowserContext() {
-  return ProfileManager::GetActiveUserProfile();
-}

chrome/browser/ui/ash/chrome_shell_content_state.h

-// Copyright 2015 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.
-
-#ifndef CHROME_BROWSER_UI_ASH_CHROME_SHELL_CONTENT_STATE_H_
-#define CHROME_BROWSER_UI_ASH_CHROME_SHELL_CONTENT_STATE_H_
-
-#include "ash/content/shell_content_state.h"
-#include "base/macros.h"
-
-class ChromeShellContentState : public ash::ShellContentState {
- public:
-  ChromeShellContentState();
-  ~ChromeShellContentState() override;
-
-  static ChromeShellContentState* GetInstance();
-
-  // Overridden from ash::ShellContentState:
-  content::BrowserContext* GetActiveBrowserContext() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(ChromeShellContentState);
-};
-
-#endif  // CHROME_BROWSER_UI_ASH_CHROME_SHELL_CONTENT_STATE_H_

chrome/browser/ui/ash/chrome_shell_delegate.cc

@@ -99,7 +99,8 @@ service_manager::Connector* ChromeShellDelegate::GetShellConnector() const {
 }
 
 bool ChromeShellDelegate::CanShowWindowForUser(aura::Window* window) const {
-  return ::CanShowWindowForUser(window, base::Bind(&GetActiveBrowserContext));
+  return ::CanShowWindowForUser(window,
+                                base::BindRepeating(&GetActiveBrowserContext));
 }
 
 void ChromeShellDelegate::PreInit() {

chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc

@@ -7,7 +7,6 @@
 #include <set>
 #include <vector>
 
-#include "ash/content/shell_content_state.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
@@ -70,36 +69,22 @@ const char kBAccountIdString[] =
 const char kArrowBAccountIdString[] =
     "->{\"account_type\":\"unknown\",\"email\":\"B\"}";
 
-// TODO(beng): This implementation seems only superficially different to the
-//             production impl. Evaluate whether or not we can just use that
-//             one.
-class TestShellContentState : public ash::ShellContentState {
- public:
-  TestShellContentState() {}
-  ~TestShellContentState() override {}
-
- private:
-  content::BrowserContext* GetActiveBrowserContext() override {
-    const user_manager::UserManager* user_manager =
-        user_manager::UserManager::Get();
-    const user_manager::User* active_user = user_manager->GetActiveUser();
-    return active_user ? multi_user_util::GetProfileFromAccountId(
-                             active_user->GetAccountId())
-                       : NULL;
-  }
-
-  DISALLOW_COPY_AND_ASSIGN(TestShellContentState);
-};
+const content::BrowserContext* GetActiveContext() {
+  const user_manager::UserManager* user_manager =
+      user_manager::UserManager::Get();
+  const user_manager::User* active_user = user_manager->GetActiveUser();
+  return active_user ? multi_user_util::GetProfileFromAccountId(
+                           active_user->GetAccountId())
+                     : nullptr;
+}
 
 class TestShellDelegateChromeOS : public ash::TestShellDelegate {
  public:
   TestShellDelegateChromeOS() {}
 
   bool CanShowWindowForUser(aura::Window* window) const override {
-    return ::CanShowWindowForUser(
-        window,
-        base::Bind(&ash::ShellContentState::GetActiveBrowserContext,
-                   base::Unretained(ash::ShellContentState::GetInstance())));
+    return ::CanShowWindowForUser(window,
+                                  base::BindRepeating(&GetActiveContext));
   }
 
  private:
@@ -289,10 +274,6 @@ void MultiUserWindowManagerChromeOSTest::SetUp() {
   chromeos::DeviceSettingsService::Initialize();
   chromeos::CrosSettings::Initialize();
   ash_test_helper()->set_test_shell_delegate(new TestShellDelegateChromeOS);
-  ash::AshTestEnvironmentContent* test_environment =
-      static_cast<ash::AshTestEnvironmentContent*>(
-          ash_test_helper()->ash_test_environment());
-  test_environment->set_content_state(new ::TestShellContentState);
   AshTestBase::SetUp();
   profile_manager_.reset(
       new TestingProfileManager(TestingBrowserProcess::GetGlobal()));

chrome/browser/ui/ash/session_util.cc

@@ -42,7 +42,7 @@ content::BrowserContext* GetBrowserContextForWindow(aura::Window* window,
 
 }  // namespace
 
-content::BrowserContext* GetActiveBrowserContext() {
+const content::BrowserContext* GetActiveBrowserContext() {
   DCHECK(user_manager::UserManager::Get()->GetLoggedInUsers().size());
   return ProfileManager::GetActiveUserProfile();
 }
@@ -52,11 +52,11 @@ bool CanShowWindowForUser(
     const GetActiveBrowserContextCallback& get_context_callback) {
   DCHECK(window);
   if (user_manager::UserManager::Get()->GetLoggedInUsers().size() > 1u) {
-    content::BrowserContext* active_browser_context =
+    const content::BrowserContext* active_browser_context =
         get_context_callback.Run();
-    content::BrowserContext* owner_browser_context =
+    const content::BrowserContext* owner_browser_context =
         GetBrowserContextForWindow(window, false);
-    content::BrowserContext* shown_browser_context =
+    const content::BrowserContext* shown_browser_context =
         GetBrowserContextForWindow(window, true);
 
     if (owner_browser_context && active_browser_context &&

chrome/browser/ui/ash/session_util.h

@@ -20,10 +20,10 @@ namespace user_manager {
 class User;
 }
 
-content::BrowserContext* GetActiveBrowserContext();
+const content::BrowserContext* GetActiveBrowserContext();
 
 using GetActiveBrowserContextCallback =
-    base::Callback<content::BrowserContext*(void)>;
+    base::RepeatingCallback<const content::BrowserContext*(void)>;
 
 // See documentation in ash::ShellDelegate for the method of the same name.
 // |context| is the content::BrowserContext deemed active for the current