3 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/browser.cc b/chrome/browser/browser.cc
index c3c31a3..e452b67 100644
--- a/chrome/browser/browser.cc
+++ b/chrome/browser/browser.cc
@@ -1243,7 +1243,7 @@ void Browser::ExecuteCommandWithDisposition(
     case IDC_NEW_WINDOW_PROFILE_7:
     case IDC_NEW_WINDOW_PROFILE_8:
         NewProfileWindowByIndex(id - IDC_NEW_WINDOW_PROFILE_0);    break;
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(OS_LINUX)
     case IDC_CLOSE_WINDOW:          CloseWindow();                 break;
 #endif
     case IDC_NEW_TAB:               NewTab();                      break;
diff --git a/chrome/browser/tab_restore_uitest.cc b/chrome/browser/tab_restore_uitest.cc
index c253046..d5d1239 100644
--- a/chrome/browser/tab_restore_uitest.cc
+++ b/chrome/browser/tab_restore_uitest.cc
@@ -484,9 +484,6 @@ TEST_F(TabRestoreUITest, RestoreCrossSiteWithExistingSiteInstance) {
   EXPECT_EQ(http_url2, GetActiveTabURL());
 }
 
-// TODO(estade): The browser currently ignores the CloseWindow command. We need
-// to enable that command before we can enable this test.
-#if defined(OS_WIN)
 TEST_F(TabRestoreUITest, RestoreWindow) {
   // Create a new window.
   int window_count;
@@ -542,4 +539,3 @@ TEST_F(TabRestoreUITest, RestoreWindow) {
   ASSERT_TRUE(restored_tab_proxy->GetCurrentURL(&url));
   EXPECT_TRUE(url == url2_);
 }
-#endif  // defined(OS_WIN)
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 62ba163..3c1f776 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -405,12 +405,16 @@ void UITest::QuitBrowser() {
       browsers.push_back(browser_proxy);
     }
 
+// This is disabled for now on linux because it causes a crash. See
+// http://crbug.com/12334
+#if !defined(OS_LINUX)
     for (BrowserVector::iterator iter = browsers.begin();
       iter != browsers.end(); ++iter) {
       // Use ApplyAccelerator since it doesn't wait
       (*iter)->ApplyAccelerator(IDC_CLOSE_WINDOW);
       delete (*iter);
     }
+#endif
 
     // Now, drop the automation IPC channel so that the automation provider in
     // the browser notices and drops its reference to the browser process.