Validate the page title in engine browser test

blimp/engine/browser_tests/engine_browsertest.cc

Index: blimp/engine/browser_tests/engine_browsertest.cc
diff --git a/blimp/engine/browser_tests/engine_browsertest.cc b/blimp/engine/browser_tests/engine_browsertest.cc
index 0128d9e9eeedb517e4454f85d62e9cfb540dd2bb..7a34a934aa3290ca8b7a5e188309ccb07ea3e2d1 100644
--- a/blimp/engine/browser_tests/engine_browsertest.cc
+++ b/blimp/engine/browser_tests/engine_browsertest.cc
@@ -48,6 +48,39 @@ class EngineBrowserTest : public BlimpBrowserTest {
         kDummyTabId, &client_rw_feature_delegate_);
     client_session_->GetImeFeature()->set_delegate(
         &client_ime_feature_delegate_);
+
+    // Skip assigner. Engine info is already available.
+    client_session_->ConnectWithAssignment(client::ASSIGNMENT_REQUEST_RESULT_OK,
+                                           GetAssignment());
+    client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100),
+                                                             1);
+    client_session_->GetTabControlFeature()->CreateTab(kDummyTabId);
+
+    EXPECT_TRUE(embedded_test_server()->Start());
+  }
+
+  void NavigateToLocalUrl(std::string path) {
+    GURL url = embedded_test_server()->GetURL(path);
+    client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId,
+                                                               url.spec());
+  }
+
+  void ExpectPageLoad(std::string title) {
+    testing::InSequence s;
+
+    // When navigating, the title changes to the requested URL before becoming
+    // the actual title.
+    EXPECT_CALL(client_nav_feature_delegate_,
+                OnTitleChanged(kDummyTabId, testing::_));
+    EXPECT_CALL(client_nav_feature_delegate_,
+                OnTitleChanged(kDummyTabId, title))
+        .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::SignalCompletion));
+  };
+
+  void RunAndVerify() {
+    RunUntilCompletion();
+    testing::Mock::VerifyAndClearExpectations(&client_rw_feature_delegate_);
+    testing::Mock::VerifyAndClearExpectations(&client_nav_feature_delegate_);
   }
 
   client::MockNavigationFeatureDelegate client_nav_feature_delegate_;
@@ -59,29 +92,27 @@ class EngineBrowserTest : public BlimpBrowserTest {
   DISALLOW_COPY_AND_ASSIGN(EngineBrowserTest);
 };
 
+/*
 IN_PROC_BROWSER_TEST_F(EngineBrowserTest, LoadUrl) {
-  testing::InSequence s;
+  EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1));
+  ExpectPageLoad("page1");
+  NavigateToLocalUrl("/page1.html");
+  RunAndVerify();
+}
+*/
 
-  EXPECT_TRUE(embedded_test_server()->Start());
-  GURL url = embedded_test_server()->GetURL("/hello.html");
+IN_PROC_BROWSER_TEST_F(EngineBrowserTest, GoBack) {
+  ExpectPageLoad("page1");
+  NavigateToLocalUrl("/page1.html");
+  RunAndVerify();
 
-  EXPECT_CALL(client_rw_feature_delegate_, OnRenderWidgetCreated(1));
-  EXPECT_CALL(client_nav_feature_delegate_,
-              OnTitleChanged(kDummyTabId, url.GetContent()));
-  EXPECT_CALL(client_nav_feature_delegate_,
-              OnTitleChanged(kDummyTabId, "hello"))
-      .WillOnce(InvokeWithoutArgs(this, &EngineBrowserTest::SignalCompletion));
-
-  // Skip assigner. Engine info is already available.
-  client_session_->ConnectWithAssignment(client::ASSIGNMENT_REQUEST_RESULT_OK,
-                                         GetAssignment());
-  client_session_->GetTabControlFeature()->SetSizeAndScale(gfx::Size(100, 100),
-                                                           1);
-  client_session_->GetTabControlFeature()->CreateTab(kDummyTabId);
-  client_session_->GetNavigationFeature()->NavigateToUrlText(kDummyTabId,
-                                                             url.spec());
-
-  RunUntilCompletion();
+  ExpectPageLoad("page2");
+  NavigateToLocalUrl("/page2.html");
+  RunAndVerify();
+
+  ExpectPageLoad("page1");
+  client_session_->GetNavigationFeature()->GoBack(kDummyTabId);
+  RunAndVerify();
 }
 
 }  // namespace