Revert 120139 - Get browser_tests to build on Windows. Remove webui-based repost warning dialog from build.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9280013

TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9320026

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

4 files changed, 6 insertions, 8 deletions

diff --git a/chrome/browser/ui/browser_list_win.cc b/chrome/browser/ui/browser_list_win.cc
index 10554ad..88a46b1 100644
--- a/chrome/browser/ui/browser_list_win.cc
+++ b/chrome/browser/ui/browser_list_win.cc
@@ -8,7 +8,5 @@
 
 // static
 void BrowserList::AllBrowsersClosedAndAppExiting() {
-#if !defined(USE_AURA)
   views::Widget::CloseAllSecondaryWidgets();
-#endif
 }
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
index e447f029..6d9366c 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.cc
@@ -65,14 +65,14 @@ void TabModalConfirmDialogTest::CloseDialog(bool accept) {
     dialog_->OnAccept(NULL);
   else
     dialog_->OnCancel(NULL);
-#elif defined(OS_CHROMEOS) && !defined(USE_AURA)
+#elif defined(OS_CHROMEOS) || defined(USE_AURA)
   // |dialog_| deletes itself in |OnDialogClosed()|, so we need to save its
   // ConstrainedHTMLUIDelegate before that.
   ConstrainedHtmlUIDelegate* constrained_html_ui_delegate =
       dialog_->constrained_html_ui_delegate();
   dialog_->OnDialogClosed(accept ? "true" : "false");
   constrained_html_ui_delegate->OnDialogCloseFromWebUI();
-#else
+#elif defined(OS_WIN)
   if (accept)
     dialog_->GetDialogClientView()->AcceptWindow();
   else
diff --git a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
index 400d8d0..7bce236 100644
--- a/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
+++ b/chrome/browser/ui/tab_modal_confirm_dialog_browsertest.h
@@ -15,11 +15,11 @@ typedef TabModalConfirmDialogMac TabModalConfirmDialog;
 #elif defined(TOOLKIT_GTK)
 #include "chrome/browser/ui/gtk/tab_modal_confirm_dialog_gtk.h"
 typedef TabModalConfirmDialogGtk TabModalConfirmDialog;
-#elif defined(OS_CHROMEOS) && !defined(USE_AURA)
+#elif defined(OS_CHROMEOS) || defined(USE_AURA)
 #include "chrome/browser/ui/webui/constrained_html_ui.h"
 #include "chrome/browser/ui/webui/tab_modal_confirm_dialog_webui.h"
 typedef TabModalConfirmDialogWebUI TabModalConfirmDialog;
-#else
+#elif defined(OS_WIN)
 #include "chrome/browser/ui/views/tab_modal_confirm_dialog_views.h"
 typedef TabModalConfirmDialogViews TabModalConfirmDialog;
 #endif
diff --git a/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc b/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc
index a830d1b..7e45167 100644
--- a/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc
+++ b/chrome/browser/ui/views/aura/caps_lock_handler_browsertest.cc
@@ -88,9 +88,9 @@ class CapsLockHandlerTest : public InProcessBrowserTest {
 
 }  // namespace
 
-#if defined(OS_CHROMEOS)
 // Check if HandleToggleCapsLock() really changes the lock state.
 IN_PROC_BROWSER_TEST_F(CapsLockHandlerTest, TestCapsLock) {
+#if defined(OS_CHROMEOS)
   EXPECT_EQ(initial_caps_lock_state_, handler_->caps_lock_is_on_for_test());
   EXPECT_TRUE(handler_->HandleToggleCapsLock());
   EXPECT_EQ(!initial_caps_lock_state_, xkeyboard_.CapsLockIsEnabled());
@@ -100,5 +100,5 @@ IN_PROC_BROWSER_TEST_F(CapsLockHandlerTest, TestCapsLock) {
   handler_->OnCapsLockChange(initial_caps_lock_state_);
   EXPECT_EQ(initial_caps_lock_state_, xkeyboard_.CapsLockIsEnabled());
   EXPECT_EQ(initial_caps_lock_state_, handler_->caps_lock_is_on_for_test());
-}
 #endif
+}