SearchTabHelper: Find browser/window instead of having them passed in

chrome/browser/ui/browser_browsertest.cc

Index: chrome/browser/ui/browser_browsertest.cc
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index 5ce38f3d5fc0248649a6b0a64c313588f3d8a0a5..b27450b8822b13379290c6b2abda3bf7ca5049d6 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -56,6 +56,7 @@
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
 #include "chrome/browser/ui/extensions/app_launch_params.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
+#include "chrome/browser/ui/search/search_tab_helper.h"
 #include "chrome/browser/ui/startup/startup_browser_creator.h"
 #include "chrome/browser/ui/startup/startup_browser_creator_impl.h"
 #include "chrome/browser/ui/tabs/pinned_tab_codec.h"
@@ -74,6 +75,7 @@
 #include "components/app_modal/javascript_app_modal_dialog.h"
 #include "components/app_modal/native_app_modal_dialog.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
+#include "components/omnibox/common/omnibox_focus_state.h"
 #include "components/prefs/pref_service.h"
 #include "components/sessions/core/base_session_service_test_helper.h"
 #include "components/translate/core/browser/language_state.h"
@@ -1515,6 +1517,52 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, ShouldShowLocationBar) {
   DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
 }
 
+// Regression test for crbug.com/702505.
+IN_PROC_BROWSER_TEST_F(BrowserTest, ReattachDevToolsWindow) {
+  ASSERT_TRUE(embedded_test_server()->Start());
+  WebContents* web_contents =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  GURL ntp_url(search::GetNewTabPageURL(browser()->profile()));

[Peter Kasting, 2017/03/20 20:11:10]

Nit: Prefer = to () in this case; see
https://www.chromium.org/developers/coding-style/cpp-dos-and-donts#TOC-Variab...

[Marc Treib, 2017/03/21 08:49:08]

Done.

+  ui_test_utils::NavigateToURL(browser(), ntp_url);
+
+  // Open a devtools window.
+  DevToolsWindow* devtools_window =
+      DevToolsWindowTesting::OpenDevToolsWindowSync(browser(),
+                                                    /*is_docked=*/true);
+  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
+
+  // Grab its main web contents.
+  content::WebContents* devtools_main_web_contents =
+      DevToolsWindow::GetInTabWebContents(
+          devtools_window->GetInspectedWebContents(), nullptr);
+  ASSERT_NE(web_contents, devtools_main_web_contents);
+
+  // Detach the devtools window.
+  DevToolsUIBindings::Delegate* devtools_delegate =
+      static_cast<DevToolsUIBindings::Delegate*>(devtools_window);
+  devtools_delegate->SetIsDocked(false);
+
+  // This should have created a new dev tools browser.
+  ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
+
+  // Re-attach the dev tools window. This resets its Browser*.
+  devtools_delegate->SetIsDocked(true);
+  // Wait until the browser actually gets closed.
+  content::RunAllPendingInMessageLoop();
+  ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
+
+  // Do something that will make SearchTabHelper access its OmniboxView. This
+  // should not crash, even though the Browser association and thus the
+  // OmniboxView* has changed, and the old OmniboxVie has been deleted.

[Peter Kasting, 2017/03/20 20:11:10]

Nit: old OmniboxView

[Marc Treib, 2017/03/21 08:49:08]

Done.

+  SearchTabHelper* search_tab_helper =
+      SearchTabHelper::FromWebContents(devtools_main_web_contents);
+  SearchIPCRouter::Delegate* search_ipc_router_delegate =
+      static_cast<SearchIPCRouter::Delegate*>(search_tab_helper);
+  search_ipc_router_delegate->FocusOmnibox(OMNIBOX_FOCUS_INVISIBLE);
+
+  DevToolsWindowTesting::CloseDevToolsWindowSync(devtools_window);
+}
+
 // Chromeos defaults to restoring the last session, so this test isn't
 // applicable.
 #if !defined(OS_CHROMEOS)