Fix MediaClient::RequestCaptureState().

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;
 
- private:
-  ~ChromeShellContentState() override;
+  static void SetInstance(ChromeShellContentState* state);

[James Cook, 2017/01/09 21:07:19]

Do you use these public methods outside this class?

If not, remove Set/DestroyInstance and just set |instance_| (or a g_instance in
an anonymous namespace in the .cc file) in the constructor and destructor

[riajiang, 2017/01/09 23:46:51]

It's not used outside. Moved it to ctor and dtor.

+  static ChromeShellContentState* GetInstance();
+  static void DestroyInstance();
 
   // Overridden from ash::ShellContentState:
   content::BrowserContext* GetActiveBrowserContext() override;
   content::BrowserContext* GetBrowserContextByIndex(
       ash::UserIndex index) override;
   content::BrowserContext* GetBrowserContextForWindow(
       aura::Window* window) override;
   content::BrowserContext* GetUserPresentingBrowserContextForWindow(
       aura::Window* window) override;
 
+ private:
+  static ChromeShellContentState* instance_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeShellContentState);
 };
 
 #endif  // CHROME_BROWSER_UI_ASH_CHROME_SHELL_CONTENT_STATE_H_