Using WebContents::UpdateTitleForEntry() instead of NavigationEntry::SetTitle()

content/browser/frame_host/interstitial_page_impl_browsertest.cc

 // Copyright 2015 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 "content/browser/frame_host/interstitial_page_impl.h"
 
 #include <tuple>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 274 matching lines @@
                          "create_input_and_set_text('" + text + "')");
   }
 
   bool SetSelectionChangeListener() {
     return ExecuteScript(interstitial_->GetMainFrame(),
                          "set_selection_change_listener()");
   }
 
   std::string PerformCut() {
     clipboard_message_watcher_->InitWait();
     title_update_watcher_->InitWait("TEXT_CHANGED");

[Charlie Reis, 2016/07/13 22:21:47]

Is it still useful to keep the old title_update_watcher_, or is that redundant
now?  (I don't feel strongly.)

[afakhry, 2016/07/13 22:52:50]

It's probably redundant. I also don't feel strongly. Even the comment above
"InterstitialTitleUpdateWatcher" says: "The existing TitleWatcher does not work
for interstitial pages. Note that this title watcher waits for the title update
IPC message not the actual title update. So, the new title is probably not
propagated completely, yet." 

Since we fixed this bug, I think it makes sense to remove that old watcher now.
Done.

+    const base::string16 expected_title = base::UTF8ToUTF16("TEXT_CHANGED");
+    content::TitleWatcher title_watcher(shell()->web_contents(),
+                                        expected_title);
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->Cut();
     clipboard_message_watcher_->WaitForWriteCommit();
     title_update_watcher_->Wait();
+    EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
     return clipboard_message_watcher_->last_text();
   }
 
   std::string PerformCopy() {
     clipboard_message_watcher_->InitWait();
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->Copy();
     clipboard_message_watcher_->WaitForWriteCommit();
     return clipboard_message_watcher_->last_text();
   }
 
   void PerformPaste() {
     title_update_watcher_->InitWait("TEXT_CHANGED");
+    const base::string16 expected_title = base::UTF8ToUTF16("TEXT_CHANGED");
+    content::TitleWatcher title_watcher(shell()->web_contents(),
+                                        expected_title);
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->Paste();
     title_update_watcher_->Wait();
+    EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   }
 
   void PerformSelectAll() {
     title_update_watcher_->InitWait("SELECTION_CHANGED");
+    const base::string16 expected_title =
+        base::UTF8ToUTF16("SELECTION_CHANGED");
+    content::TitleWatcher title_watcher(shell()->web_contents(),
+                                        expected_title);
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->SelectAll();
     title_update_watcher_->Wait();
+    EXPECT_EQ(expected_title, title_watcher.WaitAndGetTitle());
   }
 
  private:
   void RunTaskOnIOThreadAndWait(const base::Closure& task) {
     base::WaitableEvent completion(
         base::WaitableEvent::ResetPolicy::AUTOMATIC,
         base::WaitableEvent::InitialState::NOT_SIGNALED);
     BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                             base::Bind(&InterstitialPageImplTest::RunTask, this,
                                        task, &completion));
@@ skipping 73 matching lines @@
 
   PerformSelectAll();
 
   ASSERT_TRUE(GetSelection(&input_text));
   EXPECT_EQ("original body text", input_text);
 
   TearDownInterstitialPage();
 }
 
 }  // namespace content