Exclude immersive-mode controller tests from non-chromeos in gyp.

Instead of having the entire file in #if defined(OS_CHROME), simply exclude
the file in .gyp.

BUG=none
R=jamescook@chromium.org

Review URL: https://codereview.chromium.org/148003002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247294 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 2 insertions, 9 deletions

diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc
index 78705ca..41311ca 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc
@@ -14,8 +14,6 @@
 
 // TODO(jamescook): If immersive mode becomes popular on CrOS, consider porting
 // it to other Aura platforms (win_aura, linux_aura).  http://crbug.com/163931
-#if defined(OS_CHROMEOS)
-
 class ImmersiveModeControllerAshTest : public InProcessBrowserTest {
  public:
   ImmersiveModeControllerAshTest() : browser_view_(NULL), controller_(NULL) {}
@@ -73,5 +71,3 @@ IN_PROC_BROWSER_TEST_F(ImmersiveModeControllerAshTest,
   ASSERT_FALSE(controller()->IsEnabled());
   EXPECT_TRUE(window->hit_test_bounds_override_outer_touch().top() == 0);
 }
-
-#endif  // defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
index 3461783..cd9c100 100644
--- a/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
+++ b/chrome/browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc
@@ -2,9 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// For now, immersive fullscreen is Chrome OS only.
-#if defined(OS_CHROMEOS)
-
 #include "chrome/browser/ui/views/frame/immersive_mode_controller_ash.h"
 
 #include "ash/ash_switches.h"
@@ -341,5 +338,3 @@ TEST_F(ImmersiveModeControllerAshTestHostedApp, Layout) {
   EXPECT_FALSE(toolbar->visible());
   EXPECT_EQ(header_height, GetBoundsInWidget(contents_web_view).y());
 }
-
-#endif  // defined(OS_CHROMEOS)
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index d1c6a7a..d293966 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1773,6 +1773,7 @@
             'browser/notifications/login_state_notification_blocker_chromeos_browsertest.cc',
             'browser/ui/ash/caps_lock_delegate_chromeos_browsertest.cc',
             'browser/ui/views/select_file_dialog_extension_browsertest.cc',
+            'browser/ui/views/frame/immersive_mode_controller_ash_browsertest.cc',
             'test/data/webui/certificate_viewer_dialog_test.js',
             'test/data/webui/certificate_viewer_ui_test-inl.h',
           ],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0d422bd..d8f8b9a 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -2194,6 +2194,7 @@
         }],
         ['chromeos==0', {
           'sources!': [
+            'browser/ui/views/frame/immersive_mode_controller_ash_unittest.cc',
             'browser/ui/views/select_file_dialog_extension_unittest.cc',
           ],
         }],