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

chrome/browser/extensions/extension_url_rewrite_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 "base/process_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 75 matching lines @@
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURLOverride) {
   // Load an extension to override the NTP and check that the location bar text
   // is blank after navigating to chrome://newtab.
   LoadExtension(GetTestExtensionPath("newtab"));
   TestURLNotShown(GURL(chrome::kChromeUINewTabURL));
   // Check that the internal URL uses the chrome-extension:// scheme.
   EXPECT_TRUE(GetNavigationEntry()->GetURL().SchemeIs(
       extensions::kExtensionScheme));
 }
 
-IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURL) {
+// TODO(linux_aura) http://crbug.com/163931
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+#define MAYBE_BookmarksURL DISABLED_BookmarksURL
+#else
+#define MAYBE_BookmarksURL BookmarksURL
+#endif
+IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, MAYBE_BookmarksURL) {
   // Navigate to chrome://bookmarks and check that the location bar URL is
   // what was entered and the internal URL uses the chrome-extension:// scheme.
   TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL));
 }
 
 #if defined(FILE_MANAGER_EXTENSION)
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, FileManagerURL) {
   // Navigate to chrome://files and check that the location bar URL is
   // what was entered and the internal URL uses the chrome-extension:// scheme.
   TestExtensionURLOverride(GURL(chrome::kChromeUIFileManagerURL));
 }
 #endif
 
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, BookmarksURLWithRef) {
   // Navigate to chrome://bookmarks/#1 and check that the location bar URL is
   // what was entered and the internal URL uses the chrome-extension:// scheme.
   GURL url_with_ref(chrome::kChromeUIBookmarksURL + std::string("#1"));
   TestExtensionURLOverride(url_with_ref);
 }
 
 // Disabled for flakiness: crbug.com/176332
 IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest,
                        DISABLED_BookmarksURLOverride) {
   // Load an extension that overrides chrome://bookmarks.
   LoadExtension(GetTestExtensionPath("bookmarks"));
   // Navigate to chrome://bookmarks and check that the location bar URL is what
   // was entered and the internal URL uses the chrome-extension:// scheme.
   TestExtensionURLOverride(GURL(chrome::kChromeUIBookmarksURL));
 }