Add user_gesture param to BaseWindow::Activate

chrome/browser/ui/browser_focus_uitest.cc

Index: chrome/browser/ui/browser_focus_uitest.cc
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 6556aa0c9d21abc6c41ae456d82222e69a0ce2a8..d1ad77c547b84f95abe008fe068ea8afc31223c6 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -380,7 +380,7 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest,
   ui_test_utils::NavigateToURL(unfocused_browser, steal_focus_url);
 
   // Activate the first browser.
-  focused_browser->window()->Activate();
+  focused_browser->window()->Activate(false /* user_gesture */);
 
   ASSERT_TRUE(content::ExecuteScript(
       unfocused_browser->tab_strip_model()->GetActiveWebContents(),
@@ -660,12 +660,12 @@ IN_PROC_BROWSER_TEST_F(BrowserFocusTest, NavigateFromOmniboxIntoNewTab) {
 
 // This functionality is currently broken. http://crbug.com/304865.
 //
-//#if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
-//// TODO(erg): http://crbug.com/163931
-//#define MAYBE_FocusOnNavigate DISABLED_FocusOnNavigate
-//#else
-//#define MAYBE_FocusOnNavigate FocusOnNavigate
-//#endif
+// #if defined(OS_LINUX) && !defined(OS_CHROMEOS) && defined(USE_AURA)
+// // TODO(erg): http://crbug.com/163931
+// #define MAYBE_FocusOnNavigate DISABLED_FocusOnNavigate
+// #else
+// #define MAYBE_FocusOnNavigate FocusOnNavigate
+// #endif

[Avi (use Gerrit), 2015/05/22 21:27:25]

Don't touch this code; your patch is big enough :)

 
 IN_PROC_BROWSER_TEST_F(BrowserFocusTest, DISABLED_FocusOnNavigate) {
   // Needed on Mac.