Call WebStateObserver::DidStopLoading for native content reloads.

ios/web/web_state/navigation_callbacks_inttest.mm

 // Copyright 2017 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 <memory>
 #include <string>
 
 #include "base/memory/ptr_util.h"
 #include "base/strings/stringprintf.h"
 #import "ios/web/public/navigation_item.h"
@@ skipping 24 matching lines @@
   ASSERT_TRUE(*context);
   EXPECT_EQ(web_state, (*context)->GetWebState());
   EXPECT_EQ(url, (*context)->GetUrl());
   EXPECT_TRUE(
       PageTransitionCoreTypeIs(ui::PageTransition::PAGE_TRANSITION_TYPED,
                                (*context)->GetPageTransition()));
   EXPECT_FALSE((*context)->IsSameDocument());
   EXPECT_FALSE((*context)->IsPost());
   EXPECT_FALSE((*context)->GetError());
   ASSERT_FALSE((*context)->GetResponseHeaders());
+  ASSERT_TRUE(web_state->IsLoading());
   NavigationManager* navigation_manager = web_state->GetNavigationManager();
   NavigationItem* item = navigation_manager->GetPendingItem();
   EXPECT_EQ(url, item->GetURL());
 }
 
 // Verifies correctness of |NavigationContext| (|arg0|) for new page navigation
 // passed to |DidFinishNavigation|. Asserts that |NavigationContext| the same as
 // |context|.
 ACTION_P3(VerifyNewPageFinishedContext, web_state, url, context) {
   ASSERT_EQ(*context, arg0);
   EXPECT_EQ(web_state, (*context)->GetWebState());
   ASSERT_TRUE((*context));
   EXPECT_EQ(web_state, (*context)->GetWebState());
   EXPECT_EQ(url, (*context)->GetUrl());
   EXPECT_TRUE(
       PageTransitionCoreTypeIs(ui::PageTransition::PAGE_TRANSITION_TYPED,
                                (*context)->GetPageTransition()));
   EXPECT_FALSE((*context)->IsSameDocument());
   EXPECT_FALSE((*context)->IsPost());
   EXPECT_FALSE((*context)->GetError());
   ASSERT_TRUE((*context)->GetResponseHeaders());
   std::string mime_type;
   (*context)->GetResponseHeaders()->GetMimeType(&mime_type);
+  ASSERT_TRUE(web_state->IsLoading());
   EXPECT_EQ(kExpectedMimeType, mime_type);
   NavigationManager* navigation_manager = web_state->GetNavigationManager();
   NavigationItem* item = navigation_manager->GetLastCommittedItem();
   EXPECT_GT(item->GetTimestamp().ToInternalValue(), 0);
   EXPECT_EQ(url, item->GetURL());
 }
 
 // Verifies correctness of |NavigationContext| (|arg0|) for navigations via POST
 // HTTP methods passed to |DidStartNavigation|. Stores |NavigationContext| in
 // |context| pointer.
 ACTION_P3(VerifyPostStartedContext, web_state, url, context) {
   *context = arg0;
   ASSERT_TRUE(*context);
   EXPECT_EQ(web_state, (*context)->GetWebState());
   EXPECT_EQ(url, (*context)->GetUrl());
   EXPECT_FALSE((*context)->IsSameDocument());
   EXPECT_TRUE((*context)->IsPost());
   EXPECT_FALSE((*context)->GetError());
   ASSERT_FALSE((*context)->GetResponseHeaders());
+  ASSERT_TRUE(web_state->IsLoading());
   // TODO(crbug.com/676129): Reload does not create a pending item. Remove this
   // workaround once the bug is fixed.
   if (!ui::PageTransitionTypeIncludingQualifiersIs(
           ui::PageTransition::PAGE_TRANSITION_RELOAD,
           (*context)->GetPageTransition())) {
     NavigationManager* navigation_manager = web_state->GetNavigationManager();
     NavigationItem* item = navigation_manager->GetPendingItem();
     EXPECT_EQ(url, item->GetURL());
   }
 }
 
 // Verifies correctness of |NavigationContext| (|arg0|) for navigations via POST
 // HTTP methods passed to |DidFinishNavigation|. Stores |NavigationContext| in
 // |context| pointer.
 ACTION_P3(VerifyPostFinishedContext, web_state, url, context) {
   ASSERT_EQ(*context, arg0);
   EXPECT_EQ(web_state, (*context)->GetWebState());
   ASSERT_TRUE((*context));
   EXPECT_EQ(web_state, (*context)->GetWebState());
   EXPECT_EQ(url, (*context)->GetUrl());
   EXPECT_FALSE((*context)->IsSameDocument());
   EXPECT_TRUE((*context)->IsPost());
   EXPECT_FALSE((*context)->GetError());
+  ASSERT_TRUE(web_state->IsLoading());
   NavigationManager* navigation_manager = web_state->GetNavigationManager();
   NavigationItem* item = navigation_manager->GetLastCommittedItem();
   EXPECT_GT(item->GetTimestamp().ToInternalValue(), 0);
   EXPECT_EQ(url, item->GetURL());
 }
 
 // Verifies correctness of |NavigationContext| (|arg0|) for same page navigation
 // passed to |DidFinishNavigation|. Stores |NavigationContext| in |context|
 // pointer.
 ACTION_P4(VerifySameDocumentStartedContext,
@@ skipping 45 matching lines @@
   ASSERT_TRUE(*context);
   EXPECT_EQ(web_state, (*context)->GetWebState());
   EXPECT_EQ(url, (*context)->GetUrl());
   EXPECT_TRUE(
       PageTransitionCoreTypeIs(ui::PageTransition::PAGE_TRANSITION_TYPED,
                                (*context)->GetPageTransition()));
   EXPECT_FALSE((*context)->IsSameDocument());
   EXPECT_FALSE((*context)->IsPost());
   EXPECT_FALSE((*context)->GetError());
   EXPECT_FALSE((*context)->GetResponseHeaders());
+  ASSERT_TRUE(web_state->IsLoading());
   NavigationManager* navigation_manager = web_state->GetNavigationManager();
   NavigationItem* item = navigation_manager->GetPendingItem();
   EXPECT_EQ(url, item->GetURL());
 }
 
 // Verifies correctness of |NavigationContext| (|arg0|) for new page navigation
 // to native URLs passed to |DidFinishNavigation|. Asserts that
 // |NavigationContext| the same as |context|.
 ACTION_P3(VerifyNewNativePageFinishedContext, web_state, url, context) {
   ASSERT_EQ(*context, arg0);
@@ skipping 58 matching lines @@
   EXPECT_GT(item->GetTimestamp().ToInternalValue(), 0);
   EXPECT_EQ(url, item->GetURL());
 }
 
 // Mocks DidFinishNavigation navigation callback.
 class WebStateObserverMock : public WebStateObserver {
  public:
   WebStateObserverMock(WebState* web_state) : WebStateObserver(web_state) {}
   MOCK_METHOD1(DidStartNavigation, void(NavigationContext* context));
   MOCK_METHOD1(DidFinishNavigation, void(NavigationContext* context));
+  MOCK_METHOD0(DidStartLoading, void());
+  MOCK_METHOD0(DidStopLoading, void());
 };
 
 }  // namespace
 
 using test::HttpServer;
+using testing::StrictMock;
 using testing::_;
 
-// Test fixture for WebStateDelegate::ProvisionalNavigationStarted and
-// WebStateDelegate::DidFinishNavigation integration tests.
-class StartAndFinishNavigationTest : public WebIntTest {
+// Test fixture for WebStateDelegate::ProvisionalNavigationStarted,
+// WebStateDelegate::DidFinishNavigation, WebStateDelegate::DidStartLoading and
+// WebStateDelegate::DidStopLoading integration tests.
+class NavigationCallbacksTest : public WebIntTest {
   void SetUp() override {
     WebIntTest::SetUp();
-    observer_ = base::MakeUnique<WebStateObserverMock>(web_state());
+    observer_ = base::MakeUnique<StrictMock<WebStateObserverMock>>(web_state());
   }
 
  protected:
-  std::unique_ptr<WebStateObserverMock> observer_;
+  std::unique_ptr<StrictMock<WebStateObserverMock>> observer_;
 };
 
 // Tests successful navigation to a new page.
-TEST_F(StartAndFinishNavigationTest, NewPageNavigation) {
+TEST_F(NavigationCallbacksTest, NewPageNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyNewPageStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyNewPageFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 }
 
 // Tests web page reload navigation.
-TEST_F(StartAndFinishNavigationTest, WebPageReloadNavigation) {
+TEST_F(NavigationCallbacksTest, WebPageReloadNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Reload web page.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyReloadStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyReloadFinishedContext(web_state(), url, &context,
                                             true /* is_web_page */));
+  EXPECT_CALL(*observer_, DidStopLoading());
   // TODO(crbug.com/700958): ios/web ignores |check_for_repost| flag and current
   // delegate does not run callback for ShowRepostFormWarningDialog. Clearing
   // the delegate will allow form resubmission. Remove this workaround (clearing
   // the delegate, once |check_for_repost| is supported).
   web_state()->SetDelegate(nullptr);
   ExecuteBlockAndWaitForLoad(url, ^{
     navigation_manager()->Reload(ReloadType::NORMAL,
                                  false /*check_for_repost*/);
   });
 }
 
 // Tests user-initiated hash change.
-TEST_F(StartAndFinishNavigationTest, UserInitiatedHashChangeNavigation) {
+TEST_F(NavigationCallbacksTest, UserInitiatedHashChangeNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyNewPageStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyNewPageFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Perform same-page navigation.
   const GURL hash_url = HttpServer::MakeUrl("http://chromium.test#1");
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifySameDocumentStartedContext(
           web_state(), hash_url, &context,
           ui::PageTransition::PAGE_TRANSITION_TYPED));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifySameDocumentFinishedContext(
           web_state(), hash_url, &context,
           ui::PageTransition::PAGE_TRANSITION_TYPED));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(hash_url);
 
   // Perform same-page navigation by going back.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifySameDocumentStartedContext(
           web_state(), url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifySameDocumentFinishedContext(
           web_state(), url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteBlockAndWaitForLoad(url, ^{
     navigation_manager()->GoBack();
   });
 }
 
 // Tests renderer-initiated hash change.
-TEST_F(StartAndFinishNavigationTest, RendererInitiatedHashChangeNavigation) {
+TEST_F(NavigationCallbacksTest, RendererInitiatedHashChangeNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyNewPageStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyNewPageFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Perform same-page navigation using JavaScript.
   const GURL hash_url = HttpServer::MakeUrl("http://chromium.test#1");
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifySameDocumentStartedContext(
           web_state(), hash_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifySameDocumentFinishedContext(
           web_state(), hash_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteJavaScript(@"window.location.hash = '#1'");
 }
 
 // Tests state change.
-TEST_F(StartAndFinishNavigationTest, StateNavigation) {
+TEST_F(NavigationCallbacksTest, StateNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyNewPageStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyNewPageFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Perform push state using JavaScript.
   const GURL push_url = HttpServer::MakeUrl("http://chromium.test/test.html");
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifySameDocumentStartedContext(
           web_state(), push_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifySameDocumentFinishedContext(
           web_state(), push_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
   ExecuteJavaScript(@"window.history.pushState('', 'Test', 'test.html')");
 
   // Perform replace state using JavaScript.
   const GURL replace_url = HttpServer::MakeUrl("http://chromium.test/1.html");
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifySameDocumentStartedContext(
           web_state(), replace_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifySameDocumentFinishedContext(
           web_state(), replace_url, &context,
           ui::PageTransition::PAGE_TRANSITION_CLIENT_REDIRECT));
   ExecuteJavaScript(@"window.history.replaceState('', 'Test', '1.html')");
 }
 
 // Tests native content navigation.
-TEST_F(StartAndFinishNavigationTest, NativeContentNavigation) {
+TEST_F(NavigationCallbacksTest, NativeContentNavigation) {
   GURL url(url::SchemeHostPort(kTestNativeContentScheme, "ui", 0).Serialize());
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyNewNativePageStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyNewNativePageFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 }
 
 // Tests native content reload navigation.
-TEST_F(StartAndFinishNavigationTest, NativeContentReload) {
+TEST_F(NavigationCallbacksTest, NativeContentReload) {
   GURL url(url::SchemeHostPort(kTestNativeContentScheme, "ui", 0).Serialize());
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Reload native content.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyReloadStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyReloadFinishedContext(web_state(), url, &context,
                                             false /* is_web_page */));
+  EXPECT_CALL(*observer_, DidStopLoading());
   navigation_manager()->Reload(ReloadType::NORMAL, false /*check_for_repost*/);
 }
 
 // Tests successful navigation to a new page with post HTTP method.
-TEST_F(StartAndFinishNavigationTest, UserInitiatedPostNavigation) {
+TEST_F(NavigationCallbacksTest, UserInitiatedPostNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "Chromium Test";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyPostStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyPostFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
 
   // Load request using POST HTTP method.
   web::NavigationManager::WebLoadParams params(url);
   params.post_data.reset(
       [[@"foo" dataUsingEncoding:NSUTF8StringEncoding] retain]);
   params.extra_headers.reset([@{ @"Content-Type" : @"text/html" } retain]);
   LoadWithParams(params);
 }
 
 // Tests successful navigation to a new page with post HTTP method.
-TEST_F(StartAndFinishNavigationTest, RendererInitiatedPostNavigation) {
+TEST_F(NavigationCallbacksTest, RendererInitiatedPostNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   responses[url] = "<form method='post' id='form'></form>";
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Submit the form using JavaScript.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyPostStartedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyPostFinishedContext(web_state(), url, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteJavaScript(@"window.document.getElementById('form').submit();");
 }
 
 // Tests successful reload of a page returned for post request.
-TEST_F(StartAndFinishNavigationTest, ReloadPostNavigation) {
+TEST_F(NavigationCallbacksTest, ReloadPostNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   const GURL action = HttpServer::MakeUrl("http://action.test");
   responses[url] =
       base::StringPrintf("<form method='post' id='form' action='%s'></form>",
                          action.spec().c_str());
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Submit the form using JavaScript.
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteBlockAndWaitForLoad(action, ^{
     ExecuteJavaScript(@"window.document.getElementById('form').submit();");
   });
 
   // Reload the page.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyPostStartedContext(web_state(), action, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyPostFinishedContext(web_state(), action, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   // TODO(crbug.com/700958): ios/web ignores |check_for_repost| flag and current
   // delegate does not run callback for ShowRepostFormWarningDialog. Clearing
   // the delegate will allow form resubmission. Remove this workaround (clearing
   // the delegate, once |check_for_repost| is supported).
   web_state()->SetDelegate(nullptr);
   ExecuteBlockAndWaitForLoad(action, ^{
     navigation_manager()->Reload(ReloadType::NORMAL,
                                  false /*check_for_repost*/);
   });
 }
 
 // Tests going forward to a page rendered from post response.
-TEST_F(StartAndFinishNavigationTest, ForwardPostNavigation) {
+TEST_F(NavigationCallbacksTest, ForwardPostNavigation) {
   const GURL url = HttpServer::MakeUrl("http://chromium.test");
   std::map<GURL, std::string> responses;
   const GURL action = HttpServer::MakeUrl("http://action.test");
   responses[url] =
       base::StringPrintf("<form method='post' id='form' action='%s'></form>",
                          action.spec().c_str());
   web::test::SetUpSimpleHttpServer(responses);
 
   // Perform new page navigation.
   NavigationContext* context = nullptr;
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   LoadUrl(url);
 
   // Submit the form using JavaScript.
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteBlockAndWaitForLoad(action, ^{
     ExecuteJavaScript(@"window.document.getElementById('form').submit();");
   });
 
   // Go Back.
   EXPECT_CALL(*observer_, DidStartNavigation(_));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_));
+  EXPECT_CALL(*observer_, DidStopLoading());
   ExecuteBlockAndWaitForLoad(url, ^{
     navigation_manager()->GoBack();
   });
 
   // Go forward.
   EXPECT_CALL(*observer_, DidStartNavigation(_))
       .WillOnce(VerifyPostStartedContext(web_state(), action, &context));
+  EXPECT_CALL(*observer_, DidStartLoading());
   EXPECT_CALL(*observer_, DidFinishNavigation(_))
       .WillOnce(VerifyPostFinishedContext(web_state(), action, &context));
+  EXPECT_CALL(*observer_, DidStopLoading());
   // TODO(crbug.com/700958): ios/web ignores |check_for_repost| flag and current
   // delegate does not run callback for ShowRepostFormWarningDialog. Clearing
   // the delegate will allow form resubmission. Remove this workaround (clearing
   // the delegate, once |check_for_repost| is supported).
   web_state()->SetDelegate(nullptr);
   ExecuteBlockAndWaitForLoad(action, ^{
     navigation_manager()->GoForward();
   });
 }
 
 }  // namespace web