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 163 matching lines @@
     }
     return false;
   }
 
   std::unique_ptr<base::RunLoop> run_loop_;
   std::string last_text_;
 
   DISALLOW_COPY_AND_ASSIGN(ClipboardMessageWatcher);
 };
 
+// An observer of the interstitial page WebContents that makes sure any title
+// changes made by the interstitial page is emitted to the WebContentsObservers

[Charlie Reis, 2016/06/24 22:21:17]

nit: s/is/are/

[afakhry, 2016/06/27 14:29:18]

Done.

+// as WebContentsObserver::TitleWasSet() event.
+class WebContentsTitleWatcher : public WebContentsObserver {
+ public:
+  WebContentsTitleWatcher(WebContents* contents)
+      : WebContentsObserver(contents) {}
+  ~WebContentsTitleWatcher() override {}
+
+  // WebContentsObserver:
+  void TitleWasSet(NavigationEntry* entry, bool explicit_set) override {
+    if (!run_loop_)
+      return;
+
+    if (expected_title_ == web_contents()->GetTitle()) {
+      if (run_loop_->running())
+        run_loop_->Quit();
+      else
+        title_was_set_already_ = true;
+    }
+  }
+
+  void InitWait(const std::string& expected_title) {
+    DCHECK(!run_loop_);
+    expected_title_ = base::UTF8ToUTF16(expected_title);
+    run_loop_.reset(new base::RunLoop());
+  }
+
+  void WaitForTitleWasSetEvent() {
+    DCHECK(run_loop_);
+
+    if (!title_was_set_already_)
+      run_loop_->Run();
+    else
+      title_was_set_already_ = false;
+
+    run_loop_.reset();
+  }
+
+ private:
+  std::unique_ptr<base::RunLoop> run_loop_;
+  base::string16 expected_title_;
+  bool title_was_set_already_ = false;
+
+  DISALLOW_COPY_AND_ASSIGN(WebContentsTitleWatcher);
+};
+
 }  // namespace
 
 class InterstitialPageImplTest : public ContentBrowserTest {
  public:
   InterstitialPageImplTest() {}
 
   ~InterstitialPageImplTest() override {}
 
  protected:
   void SetUpTestClipboard() {
@@ skipping 33 matching lines @@
     }
 #endif
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_COPY_PASTE);
     clipboard_writer.WriteText(base::ASCIIToUTF16(text));
   }
 
   void SetUpInterstitialPage() {
     WebContentsImpl* web_contents =
         static_cast<WebContentsImpl*>(shell()->web_contents());
 
+    web_contents_title_watcher_.reset(
+        new WebContentsTitleWatcher(web_contents));
+
     // Create the interstitial page.
     TestInterstitialPageDelegate* interstitial_delegate =
         new TestInterstitialPageDelegate;
     GURL url("http://interstitial");
     interstitial_.reset(new InterstitialPageImpl(
         web_contents, static_cast<RenderWidgetHostDelegate*>(web_contents),
         true, url, interstitial_delegate));
     interstitial_->Show();
     WaitForInterstitialAttach(web_contents);
 
@@ skipping 39 matching lines @@
   }
 
   bool SetSelectionChangeListener() {
     return ExecuteScript(interstitial_->GetMainFrame(),
                          "set_selection_change_listener()");
   }
 
   std::string PerformCut() {
     clipboard_message_watcher_->InitWait();
     title_update_watcher_->InitWait("TEXT_CHANGED");
+    web_contents_title_watcher_->InitWait("TEXT_CHANGED");
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->Cut();
     clipboard_message_watcher_->WaitForWriteCommit();
     title_update_watcher_->Wait();
+    web_contents_title_watcher_->WaitForTitleWasSetEvent();
     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");
+    web_contents_title_watcher_->InitWait("TEXT_CHANGED");
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->Paste();
     title_update_watcher_->Wait();
+    web_contents_title_watcher_->WaitForTitleWasSetEvent();
   }
 
   void PerformSelectAll() {
     title_update_watcher_->InitWait("SELECTION_CHANGED");
+    web_contents_title_watcher_->InitWait("SELECTION_CHANGED");
     RenderFrameHostImpl* rfh =
         static_cast<RenderFrameHostImpl*>(interstitial_->GetMainFrame());
     rfh->GetRenderWidgetHost()->delegate()->SelectAll();
     title_update_watcher_->Wait();
+    web_contents_title_watcher_->WaitForTitleWasSetEvent();
   }
 
  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));
     completion.Wait();
   }
 
   void RunTask(const base::Closure& task, base::WaitableEvent* completion) {
     task.Run();
     completion->Signal();
   }
 
   std::unique_ptr<InterstitialPageImpl> interstitial_;
   scoped_refptr<ClipboardMessageWatcher> clipboard_message_watcher_;
   scoped_refptr<InterstitialTitleUpdateWatcher> title_update_watcher_;
+  std::unique_ptr<WebContentsTitleWatcher> web_contents_title_watcher_;
 
   DISALLOW_COPY_AND_ASSIGN(InterstitialPageImplTest);
 };
 
 IN_PROC_BROWSER_TEST_F(InterstitialPageImplTest, Cut) {
   SetUpInterstitialPage();
 
   ASSERT_TRUE(CreateInputAndSetText("text-to-cut"));
   ASSERT_TRUE(FocusInputAndSelectText());
 
@@ skipping 52 matching lines @@
 
   PerformSelectAll();
 
   ASSERT_TRUE(GetSelection(&input_text));
   EXPECT_EQ("original body text", input_text);
 
   TearDownInterstitialPage();
 }
 
 }  // namespace content