Move immersive fullscreen check into ImmersiveFullscreenConfiguration.

chrome/browser/ui/views/frame/browser_view_interactive_uitest.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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/autocomplete/autocomplete_controller.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_commands.h"
+#include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/search/instant_test_utils.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/frame/contents_container.h"
 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h"
 #include "chrome/browser/ui/views/frame/overlay_container.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
@@ skipping 144 matching lines @@
 // Immersive fullscreen is currently enabled only on Chrome OS.
 #if defined(OS_CHROMEOS)
 
 class BrowserViewImmersiveInstantExtendedTest : public InProcessBrowserTest,
                                                 public InstantTestBase {
  public:
   BrowserViewImmersiveInstantExtendedTest() {}
   virtual ~BrowserViewImmersiveInstantExtendedTest() {}
 
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    chrome::EnableImmersiveFullscreenForTest();
+    ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest();
     chrome::EnableInstantExtendedAPIForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
     InstantTestBase::Init(instant_url);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserViewImmersiveInstantExtendedTest);
 };
 
 IN_PROC_BROWSER_TEST_F(BrowserViewImmersiveInstantExtendedTest,
                        ImmersiveInstantExtended) {
   ui::ScopedAnimationDurationScaleMode zero_duration_mode(
       ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   BookmarkBarView::DisableAnimationsForTesting(true);
 
   // Cache some pointers we'll need below.
   BrowserView* browser_view = static_cast<BrowserView*>(browser()->window());
   ToolbarView* toolbar = browser_view->toolbar();
 
   // Start up both instant and immersive fullscreen.
   ASSERT_NO_FATAL_FAILURE(SetupInstant(browser()));
-  ASSERT_TRUE(chrome::UseImmersiveFullscreen());
+  ASSERT_TRUE(ImmersiveFullscreenConfiguration::UseImmersiveFullscreen());
   chrome::ToggleFullscreenMode(browser());
   ASSERT_TRUE(browser_view->IsFullscreen());
   ASSERT_TRUE(browser_view->immersive_mode_controller()->IsEnabled());
 
   ////////////////////////////////////////////////////////////////////////////
   // Test suggestions on a normal web page, which are in an overlay.
 
   // Focus omnibox, which constructs an overlay web contents.
   FocusOmniboxAndWaitForInstantOverlayAndNTPSupport();
   EXPECT_TRUE(instant()->model()->mode().is_default());
@@ skipping 78 matching lines @@
   EXPECT_TRUE(browser_view->immersive_mode_controller()->IsRevealed());
   // The active web contents are aligned with the toolbar.
   gfx::Rect web_view_rect_in_widget = GetRectInWidget(
       browser_view->GetContentsContainerForTest()->GetActiveWebViewForTest());
   EXPECT_EQ(GetRectInWidget(toolbar).bottom(), web_view_rect_in_widget.y());
 
   BookmarkBarView::DisableAnimationsForTesting(false);
 }
 
 #endif  // defined(OS_CHROMEOS)