Convert more test helpers to base::RunLoop, fix page title checks.

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 8fbaf0a6646dfc2650bf02e6c028811465f68f48..f6cf8387db5040b99e4408f6415a58664635f4f5 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -2386,11 +2386,11 @@ class ClickModifierTest : public InProcessBrowserTest {
       base::FilePath(FILE_PATH_LITERAL("href.html")));
   }
 
-  base::string16 getFirstPageTitle() {
+  base::string16 GetFirstPageTitle() {
     return ASCIIToUTF16(kFirstPageTitle);
   }
 
-  base::string16 getSecondPageTitle() {
+  base::string16 GetSecondPageTitle() {
     return ASCIIToUTF16(kSecondPageTitle);
   }
 
@@ -2418,7 +2418,8 @@ class ClickModifierTest : public InProcessBrowserTest {
       same_tab_observer.Wait();
       EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile()));
       EXPECT_EQ(1, browser->tab_strip_model()->count());
-      EXPECT_EQ(getSecondPageTitle(), web_contents->GetTitle());
+      EXPECT_EQ(GetSecondPageTitle(),
+                content::TitleWatcher(web_contents).WaitAndGetTitle());
       return;
     }
 
@@ -2436,13 +2437,15 @@ class ClickModifierTest : public InProcessBrowserTest {
     EXPECT_EQ(1u, chrome::GetBrowserCount(browser->profile()));
     EXPECT_EQ(2, browser->tab_strip_model()->count());
     web_contents = browser->tab_strip_model()->GetActiveWebContents();
-    WaitForLoadStop(web_contents);
+    base::string16 expected_title;
     if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
-      EXPECT_EQ(getSecondPageTitle(), web_contents->GetTitle());
+      expected_title = GetSecondPageTitle();
     } else {
       ASSERT_EQ(WindowOpenDisposition::NEW_BACKGROUND_TAB, disposition);
-      EXPECT_EQ(getFirstPageTitle(), web_contents->GetTitle());
+      expected_title = GetFirstPageTitle();
     }

[Peter Kasting, 2017/01/12 18:16:17]

Nit: The preceding lines could optionally be written more briefly as:

    bool fg_tab = disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB;
    ASSERT_TRUE(
        fg_tab || disposition == WindowOpenDisposition::NEW_BACKGROUND_TAB);
    auto expected_title = fg_tab ? GetFirstPageTitle() : GetSecondPageTitle();

[Alexander Semashko, 2017/01/12 20:48:19]

To me the current code is much more clear, I'd leave it as it is.

+    EXPECT_EQ(expected_title,
+              content::TitleWatcher(web_contents).WaitAndGetTitle());
   }
 
  private: