Move immersive fullscreen check into ImmersiveFullscreenConfiguration.

chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc

 // Copyright 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/immersive_mode_controller_ash.h"
 
 #include "ash/ash_switches.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/app_modal_dialogs/app_modal_dialog_queue.h"
 #include "chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller.h"
 #include "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"
+#include "chrome/browser/ui/immersive_fullscreen_configuration.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/browser/ui/views/browser_dialogs.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "ui/aura/env.h"
@@ skipping 35 matching lines @@
 
   // Callback for when the onbeforeunload dialog closes for the sake of testing
   // the dialog with immersive mode.
   void OnBeforeUnloadJavaScriptDialogClosed(
       bool success,
       const string16& user_input) {
   }
 
   // content::BrowserTestBase overrides:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    chrome::EnableImmersiveFullscreenForTest();
+    ImmersiveFullscreenConfiguration::EnableImmersiveFullscreenForTest();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
-    ASSERT_TRUE(chrome::UseImmersiveFullscreen());
+    ASSERT_TRUE(ImmersiveFullscreenConfiguration::UseImmersiveFullscreen());
     browser_view_ = static_cast<BrowserView*>(browser()->window());
     controller_ = static_cast<ImmersiveModeControllerAsh*>(
         browser_view_->immersive_mode_controller());
     zero_duration_mode_.reset(new ScopedAnimationDurationScaleMode(
         ScopedAnimationDurationScaleMode::ZERO_DURATION));
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     zero_duration_mode_.reset();
   }
@@ skipping 644 matching lines @@
   waiter.reset(new FullscreenNotificationObserver());
   chrome::ToggleFullscreenMode(browser());
   waiter->Wait();
 
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_EQ(ash::SHELF_VISIBLE, shelf->visibility_state());
   EXPECT_TRUE(controller()->ShouldHideTabIndicators());
 }
 
 #endif  // defined(OS_CHROMEOS)