Fix failing NavigationManagerUtil test that wasn't being run.

ios/web/navigation/navigation_manager_util_unittest.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 "ios/web/navigation/navigation_manager_util.h"
 
 #include "base/memory/ptr_util.h"
 #import "ios/web/navigation/crw_session_controller+private_constructors.h"
 #import "ios/web/navigation/crw_session_controller.h"
+#import "ios/web/navigation/navigation_manager_delegate.h"
 #import "ios/web/navigation/navigation_manager_impl.h"
 #import "ios/web/public/navigation_item.h"
 #include "ios/web/public/test/fakes/test_browser_state.h"
 #include "testing/platform_test.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 namespace web {
 
+class UtilTestNavigationManagerDelegate : public NavigationManagerDelegate {

[Eugene But (OOO till 7-30), 2017/06/16 03:41:06]

Would it make sense to move it to web/public/test/fakes where all fakes live?

[kkhorimoto, 2017/06/21 20:50:18]

NavigationManagerDelegate is not a public interface, which is why I put it here
since we don't have any other private fakes.  But you're right that it makes
more sense to just put this in a shared location.

+ public:
+  void GoToIndex(int index) override {}
+  void LoadURLWithParams(const NavigationManager::WebLoadParams&) override {}
+  void Reload() override {}
+  void OnNavigationItemsPruned(size_t pruned_item_count) override {}
+  void OnNavigationItemChanged() override {}
+  void OnNavigationItemCommitted(
+      const LoadCommittedDetails& load_details) override {}
+  WebState* GetWebState() override { return nullptr; }
+};
+
 // Test fixture testing navigation_manager_util.h functions.
 class NavigationManagerUtilTest : public PlatformTest {
  protected:
   NavigationManagerUtilTest()
       : controller_([[CRWSessionController alloc]
             initWithBrowserState:&browser_state_]) {
+    manager_.SetBrowserState(&browser_state_);
+    manager_.SetDelegate(&delegate_);
     manager_.SetSessionController(controller_);
   }
 
   NavigationManagerImpl manager_;
+  UtilTestNavigationManagerDelegate delegate_;
   CRWSessionController* controller_;
 
  private:
   TestBrowserState browser_state_;
 };
 
 // Tests GetCommittedItemWithUniqueID, GetCommittedItemIndexWithUniqueID and
 // GetItemWithUniqueID functions.
 TEST_F(NavigationManagerUtilTest, GetCommittedItemWithUniqueID) {

[sdefresne, 2017/06/16 13:39:43]

Once you rebase, you'll have to change this line to re-enable the test :-)

[kkhorimoto, 2017/06/21 20:50:18]

Done.

   // Start with NavigationManager that only has a pending item.
   manager_.AddPendingItem(
       GURL("http://chromium.org"), Referrer(), ui::PAGE_TRANSITION_TYPED,
       web::NavigationInitiationType::USER_INITIATED,
       web::NavigationManager::UserAgentOverrideOption::INHERIT);
   NavigationItem* item = manager_.GetPendingItem();
   int unique_id = item->GetUniqueID();
   EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
 
   // Commit that pending item.
-  [controller_ commitPendingItem];
+  manager_.CommitPendingItem();
   EXPECT_EQ(item, GetCommittedItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(0, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
 
-  // Remove committed item.
+  // Commit another navigation so that the current item is updated.  This allows
+  // for removing the item with |unique_id|.
+  manager_.AddPendingItem(
+      GURL("http://test.org"), Referrer(), ui::PAGE_TRANSITION_TYPED,
+      web::NavigationInitiationType::USER_INITIATED,
+      web::NavigationManager::UserAgentOverrideOption::INHERIT);
+  manager_.CommitPendingItem();
   manager_.RemoveItemAtIndex(0);
   EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
   EXPECT_FALSE(GetItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
 
   // Add transient item.
   [controller_ addTransientItemWithURL:GURL("http://chromium.org")];
   item = manager_.GetTransientItem();
+  unique_id = item->GetUniqueID();
   EXPECT_FALSE(GetCommittedItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(item, GetItemWithUniqueID(&manager_, unique_id));
   EXPECT_EQ(-1, GetCommittedItemIndexWithUniqueID(&manager_, unique_id));
 }
 
 }  // namespace web