Remove some chrome-specific methods from content::WebUI.

chrome/browser/ui/browser_focus_uitest.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 "build/build_config.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
@@ skipping 934 matching lines @@
 
   // The tab contents should have the focus in the second tab.
   EXPECT_TRUE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_TAB_CONTAINER));
 
   // Go back to the first tab. The focus should not be in the omnibox.
   chrome::SelectPreviousTab(browser());
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());
   EXPECT_FALSE(ui_test_utils::IsViewFocused(browser(), VIEW_ID_OMNIBOX));
 }
 
+IN_PROC_BROWSER_TEST_F(BrowserFocusTest, FocusOnNavigate) {
+  // Needed on Mac.
+  ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
+  // Load the NTP.
+  ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUINewTabURL));
+  EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX));
+
+  // Navigate to another page.
+  const base::FilePath::CharType* kEmptyFile = FILE_PATH_LITERAL("empty.html");
+  GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
+      base::FilePath::kCurrentDirectory), base::FilePath(kEmptyFile)));
+  ui_test_utils::NavigateToURL(browser(), file_url);
+
+  ClickOnView(VIEW_ID_TAB_CONTAINER);
+
+  // Navigate back.  Should focus the location bar.
+  {
+    content::WindowedNotificationObserver back_nav_observer(
+        content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        content::NotificationService::AllSources());
+    chrome::GoBack(browser(), CURRENT_TAB);
+    back_nav_observer.Wait();
+  }
+
+  EXPECT_TRUE(IsViewFocused(VIEW_ID_OMNIBOX));
+
+  // Navigate forward.  Shouldn't focus the location bar.
+  ClickOnView(VIEW_ID_TAB_CONTAINER);
+  {
+    content::WindowedNotificationObserver forward_nav_observer(
+        content::NOTIFICATION_NAV_ENTRY_COMMITTED,
+        content::NotificationService::AllSources());
+    chrome::GoForward(browser(), CURRENT_TAB);
+    forward_nav_observer.Wait();
+  }
+
+  EXPECT_FALSE(IsViewFocused(VIEW_ID_OMNIBOX));
+}
+
 }  // namespace