Always prompt for permission on fullscreen and mouse lock on file:// URLs

chrome/browser/ui/exclusive_access/fullscreen_controller_browsertest.cc

 // Copyright (c) 2012 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 "base/compiler_specific.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/render_view_host.h"

[msw, 2015/02/12 00:07:59]

nit: this and some other headers may not be used anymore, I thought we had an
iwyu script, but I can't find it, maybe take a quick manual look through these?

[estark, 2015/02/12 02:33:10]

Done.

 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/test/test_navigation_observer.h"
 
 using url::kAboutBlankURL;

[msw, 2015/02/12 00:07:59]

nit: remove this, uses of kAboutBlankURL qualify the url namespace anyway.
(optionally remove others by propagating their namespace qualifications too)

 using content::WebContents;
 using ui::PAGE_TRANSITION_TYPED;
 
 class FullscreenControllerBrowserTest: public FullscreenControllerTest {

[msw, 2015/02/12 00:07:59]

nit: remove this (it's also missing a space before the colon).

 };
 
 IN_PROC_BROWSER_TEST_F(FullscreenControllerTest,
                        PendingMouseLockExitsOnTabSwitch) {
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   AddTabAtIndex(0, GURL(url::kAboutBlankURL), PAGE_TRANSITION_TYPED);
   WebContents* tab1 = browser()->tab_strip_model()->GetActiveWebContents();
 
   // Request mouse lock. Bubble is displayed.
   RequestToLockMouse(true, false);
@@ skipping 33 matching lines @@
   ASSERT_TRUE(IsFullscreenBubbleDisplayed());
 
   // Close tab. Bubble is cleared.
   {
     MouseLockNotificationObserver mouse_lock_observer;
     chrome::CloseTab(browser());
     mouse_lock_observer.Wait();
   }
   ASSERT_FALSE(IsFullscreenBubbleDisplayed());
 }
+
+IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, MouseLockOnFileURL) {

[msw, 2015/02/12 00:07:59]

You may want to add a file URL test case to
fullscreen_controller_interactive_browsertest.cc, but so many of those tests are
DISABLED_ or MAYBE_ for flakiness that maybe that isn't terribly worthwhile...

+  static const base::FilePath::CharType* kEmptyFile =
+      FILE_PATH_LITERAL("empty.html");
+  GURL file_url(ui_test_utils::GetTestUrl(
+      base::FilePath(base::FilePath::kCurrentDirectory),
+      base::FilePath(kEmptyFile)));
+  AddTabAtIndex(0, file_url, PAGE_TRANSITION_TYPED);
+  RequestToLockMouse(true, false);
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+  ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
+}
+
+IN_PROC_BROWSER_TEST_F(FullscreenControllerTest, FullscreenOnFileURL) {
+  static const base::FilePath::CharType* kEmptyFile =
+      FILE_PATH_LITERAL("empty.html");
+  GURL file_url(ui_test_utils::GetTestUrl(
+      base::FilePath(base::FilePath::kCurrentDirectory),
+      base::FilePath(kEmptyFile)));
+  AddTabAtIndex(0, file_url, PAGE_TRANSITION_TYPED);
+  RequestToLockMouse(true, false);
+  ASSERT_TRUE(IsFullscreenBubbleDisplayed());
+  ASSERT_TRUE(IsFullscreenBubbleDisplayingButtons());
+}