Automated tests for full screen & mouse lock M16 features

chrome/browser/ui/browser.h

Index: chrome/browser/ui/browser.h
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 9f0c5c39c0ac9e19583f97762c789009e80dc99c..6de6c337285a401af082c8ac2326dcf22aeba0bd 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -884,7 +884,10 @@ class Browser : public TabHandlerDelegate,
 
   // True when the current tab is in fullscreen mode, requested by
   // webkitRequestFullScreen.
-  bool IsFullscreenForTab() const;
+  bool IsFullscreenForTabOrPending() const;
+
+  // True when the mouse cursor is locked or pending lock.
+  bool IsMouseLockedOrPending() const;
 
   // Called each time the browser window is shown.
   void OnWindowDidShow();
@@ -902,14 +905,12 @@ class Browser : public TabHandlerDelegate,
   virtual BrowserWindow* CreateBrowserWindow();
 
  private:
+  friend class BrowserTest;
   FRIEND_TEST_ALL_PREFIXES(AppModeTest, EnableAppModeTest);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, NoTabsInPopups);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, ConvertTabToAppShortcut);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, OpenAppWindowLikeNtp);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, AppIdSwitch);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestNewTabExitsFullscreen);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestTabExitsItselfFromFullscreen);
-  FRIEND_TEST_ALL_PREFIXES(BrowserTest, TestFullscreenBubbleMouseLockState);
   FRIEND_TEST_ALL_PREFIXES(BrowserTest, TabEntersPresentationModeFromWindowed);
   FRIEND_TEST_ALL_PREFIXES(FullscreenExitBubbleControllerTest,
       DenyExitsFullscreen);
@@ -1031,7 +1032,7 @@ class Browser : public TabHandlerDelegate,
                                   const FilePath& path) OVERRIDE;
   virtual void ToggleFullscreenModeForTab(content::WebContents* tab,
       bool enter_fullscreen) OVERRIDE;
-  virtual bool IsFullscreenForTab(
+  virtual bool IsFullscreenForTabOrPending(
       const content::WebContents* tab) const OVERRIDE;
   virtual void JSOutOfMemory(content::WebContents* tab) OVERRIDE;
   virtual void RegisterProtocolHandler(content::WebContents* tab,