Fix MediaClient::RequestCaptureState().

chrome/browser/ui/ash/chrome_shell_content_state.h

Index: chrome/browser/ui/ash/chrome_shell_content_state.h
diff --git a/chrome/browser/ui/ash/chrome_shell_content_state.h b/chrome/browser/ui/ash/chrome_shell_content_state.h
index d3f3e80e4e95161020a07a377465825092ff331e..096b3153bb3d11bafd5929e20005d1676d60509c 100644
--- a/chrome/browser/ui/ash/chrome_shell_content_state.h
+++ b/chrome/browser/ui/ash/chrome_shell_content_state.h
@@ -11,10 +11,12 @@
 class ChromeShellContentState : public ash::ShellContentState {
  public:
   ChromeShellContentState();
-
- 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(
@@ -24,6 +26,9 @@ class ChromeShellContentState : public ash::ShellContentState {
   content::BrowserContext* GetUserPresentingBrowserContextForWindow(
       aura::Window* window) override;
 
+ private:
+  static ChromeShellContentState* instance_;
+
   DISALLOW_COPY_AND_ASSIGN(ChromeShellContentState);
 };