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

chrome/browser/extensions/extension_url_rewrite_browsertest.cc

Index: chrome/browser/extensions/extension_url_rewrite_browsertest.cc
diff --git a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
index 15b469dde3428cc6ad3ef9170dad12d9865f6fab..b0a57a3527d2de82258fde25b1db628930986755 100644
--- a/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
+++ b/chrome/browser/extensions/extension_url_rewrite_browsertest.cc
@@ -93,7 +93,13 @@ IN_PROC_BROWSER_TEST_F(ExtensionURLRewriteBrowserTest, NewTabPageURLOverride) {
       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));