OK, here's john's patch plus my sync stuff.

chrome/browser/ui/browser_navigator_browsertest.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/browser_navigator_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
@@ skipping 1176 matching lines @@
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowHistory(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_EQ(GURL(chrome::kChromeUIHistoryFrameURL),
             browser()->tab_strip_model()->GetActiveWebContents()->GetURL());
 }
 
+// TODO(linux_aura) http://crbug.com/163931
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+#define MAYBE_NavigateFromDefaultToBookmarksInSameTab DISABLED_NavigateFromDefaultToBookmarksInSameTab
+#else
+#define MAYBE_NavigateFromDefaultToBookmarksInSameTab NavigateFromDefaultToBookmarksInSameTab
+#endif
 IN_PROC_BROWSER_TEST_F(BrowserNavigatorTest,
-                       NavigateFromDefaultToBookmarksInSameTab) {
+                       MAYBE_NavigateFromDefaultToBookmarksInSameTab) {
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     chrome::ShowBookmarkManager(browser());
     observer.Wait();
   }
   EXPECT_EQ(1, browser()->tab_strip_model()->count());
   EXPECT_TRUE(StartsWithASCII(
       browser()->tab_strip_model()->GetActiveWebContents()->GetURL().spec(),
@@ skipping 27 matching lines @@
   // Now navigate using the incognito profile and check that a new window
   // is created.
   chrome::NavigateParams params_incognito(
       browser()->profile()->GetOffTheRecordProfile(),
       GetGoogleURL(), content::PAGE_TRANSITION_LINK);
   ui_test_utils::NavigateToURL(&params_incognito);
   EXPECT_EQ(2u, chrome::GetTotalBrowserCount());
 }
 
 } // namespace