Implemented WebStateObserver::DidFinishNavigation(NavigationHandle*).

ios/web/web_state/web_state_impl_unittest.mm

 // Copyright 2014 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.
 
 #import "ios/web/web_state/web_state_impl.h"
 
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #import "base/mac/bind_objc_block.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #import "base/test/ios/wait_util.h"
 #include "base/values.h"
 #import "ios/web/public/java_script_dialog_presenter.h"
 #include "ios/web/public/load_committed_details.h"
 #include "ios/web/public/test/fakes/test_browser_state.h"
 #import "ios/web/public/test/fakes/test_web_state_delegate.h"
 #include "ios/web/public/test/web_test.h"
 #import "ios/web/public/web_state/context_menu_params.h"
 #include "ios/web/public/web_state/global_web_state_observer.h"
@@ skipping 96 matching lines @@
  public:
   TestWebStateObserver(WebState* web_state)
       : WebStateObserver(web_state),
         provisional_navigation_started_called_(false),
         navigation_items_pruned_called_(false),
         navigation_item_changed_called_(false),
         navigation_item_committed_called_(false),
         page_loaded_called_with_success_(false),
         url_hash_changed_called_(false),
         history_state_changed_called_(false),
+        did_finish_navigation_called_(false),
         web_state_destroyed_called_(false) {}
 
   // Methods returning true if the corresponding WebStateObserver method has
   // been called.
   bool provisional_navigation_started_called() const {
     return provisional_navigation_started_called_;
   };
   bool navigation_items_pruned_called() const {
     return navigation_items_pruned_called_;
   }
   bool navigation_item_changed_called() const {
     return navigation_item_changed_called_;
   }
   bool navigation_item_committed_called() const {
     return navigation_item_committed_called_;
   }
   bool page_loaded_called_with_success() const {
     return page_loaded_called_with_success_;
   }
   bool url_hash_changed_called() const { return url_hash_changed_called_; }
   bool history_state_changed_called() const {
     return history_state_changed_called_;
   }
+  bool did_finish_navigation_called() const {
+    return did_finish_navigation_called_;
+  }
   bool web_state_destroyed_called() const {
     return web_state_destroyed_called_;
   }
 
  private:
   // WebStateObserver implementation:
   void ProvisionalNavigationStarted(const GURL& url) override {
     provisional_navigation_started_called_ = true;
   }
   void NavigationItemsPruned(size_t pruned_item_count) override {
     navigation_items_pruned_called_ = true;
   }
   void NavigationItemChanged() override {
     navigation_item_changed_called_ = true;
   }
   void NavigationItemCommitted(
       const LoadCommittedDetails& load_details) override {
     navigation_item_committed_called_ = true;
   }
+  void DidFinishNavigation(NavigationHandle* navigation_handle) override {
+    did_finish_navigation_called_ = true;
+  }
   void PageLoaded(PageLoadCompletionStatus load_completion_status) override {
     page_loaded_called_with_success_ =
         load_completion_status == PageLoadCompletionStatus::SUCCESS;
   }
   void UrlHashChanged() override { url_hash_changed_called_ = true; }
   void HistoryStateChanged() override { history_state_changed_called_ = true; }
   void WebStateDestroyed() override {
     EXPECT_TRUE(web_state()->IsBeingDestroyed());
     web_state_destroyed_called_ = true;
     Observe(nullptr);
   }
 
   bool provisional_navigation_started_called_;
   bool navigation_items_pruned_called_;
   bool navigation_item_changed_called_;
   bool navigation_item_committed_called_;
   bool page_loaded_called_with_success_;
   bool url_hash_changed_called_;
   bool history_state_changed_called_;
+  bool did_finish_navigation_called_;
   bool web_state_destroyed_called_;
 };
 
 // Test decider to check that the WebStatePolicyDecider methods are called as
 // expected.
 class MockWebStatePolicyDecider : public WebStatePolicyDecider {
  public:
   explicit MockWebStatePolicyDecider(WebState* web_state)
       : WebStatePolicyDecider(web_state) {}
   virtual ~MockWebStatePolicyDecider() {}
@@ skipping 184 matching lines @@
   // Test that UrlHashChanged() is called.
   EXPECT_FALSE(observer->url_hash_changed_called());
   web_state_->OnUrlHashChanged();
   EXPECT_TRUE(observer->url_hash_changed_called());
 
   // Test that HistoryStateChanged() is called.
   EXPECT_FALSE(observer->history_state_changed_called());
   web_state_->OnHistoryStateChanged();
   EXPECT_TRUE(observer->history_state_changed_called());
 
+  // Test that DidFinishNavigation() is called for same page navigations.
+  EXPECT_FALSE(observer->did_finish_navigation_called());
+  web_state_->OnSamePageNavigation(GURL("http://test"));
+  EXPECT_TRUE(observer->did_finish_navigation_called());
+
+  // Reset the observer and test that DidFinishNavigation() is called
+  // for error navigations.
+  observer = base::MakeUnique<TestWebStateObserver>(web_state_.get());
+  EXPECT_FALSE(observer->did_finish_navigation_called());
+  web_state_->OnErrorPageNavigation(GURL("http://test"));
+  EXPECT_TRUE(observer->did_finish_navigation_called());
+
   // Test that WebStateDestroyed() is called.
   EXPECT_FALSE(observer->web_state_destroyed_called());
   web_state_.reset();
   EXPECT_TRUE(observer->web_state_destroyed_called());
 
   EXPECT_EQ(nullptr, observer->web_state());
 }
 
 // Tests that WebStateDelegate methods appropriately called.
 TEST_F(WebStateTest, DelegateTest) {
@@ skipping 262 matching lines @@
       "</script>");
 
   base::test::ios::WaitUntilCondition(^{
     return message_received;
   });
   web_state_->RemoveScriptCommandCallback("test");
 }
 
 }  // namespace
 }  // namespace web