Removed use of CRWSessionController from NativeAppNavigationUtilsTest.

ios/chrome/browser/native_app_launcher/native_app_navigation_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/chrome/browser/native_app_launcher/native_app_navigation_util.h"
 
-#import "ios/web/navigation/crw_session_controller.h"
-#import "ios/web/navigation/navigation_manager_impl.h"
-#include "ios/web/public/referrer.h"
-#include "ios/web/public/test/web_test.h"
-#import "ios/web/web_state/web_state_impl.h"
+#include "base/memory/ptr_util.h"
+#import "ios/web/public/navigation_item.h"
+#import "ios/web/public/navigation_item_list.h"

[Eugene But (OOO till 7-30), 2017/03/13 21:05:40]

nit: s/import/include

[pkl (ping after 24h if needed), 2017/03/14 02:12:48]

Acknowledged.

+#import "ios/web/public/test/fakes/test_navigation_manager.h"
+#import "ios/web/public/test/fakes/test_web_state.h"
+#include "testing/platform_test.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
-namespace {
-
-class NativeAppNavigationUtilsTest : public web::WebTest {
- protected:
-  void SetUp() override {
-    web::WebTest::SetUp();
-    // WebStateImpl object is needed here to have access to CRWSessionController
-    // for setting up NavigationManager entries.
-    std::unique_ptr<web::WebStateImpl> web_state(
-        new web::WebStateImpl(GetBrowserState()));
-    web_state->GetNavigationManagerImpl().InitializeSession(NO);
-    web_state->SetWebUsageEnabled(true);
-    web_state_.reset(web_state.release());
+// Overrides underlying NavigationManager methods used by IsLinkNavigation().
+class TestNavigationManager : public web::TestNavigationManager {
+ public:
+  int GetCurrentItemIndex() const override {
+    // For testing, just return the last item. Returns -1 if |items_| is empty.
+    return items_.size() - 1;
   }
 
-  void TearDown() override {
-    web_state_.reset();
-    web::WebTest::TearDown();
+  web::NavigationItem* GetItemAtIndex(size_t index) const override {
+    return items_[index].get();
   }
 
-  web::WebState* web_state() { return web_state_->GetWebState(); }
-
+  // Adds a new navigation item of |transition| type at the end of this
+  // navigation manager.
   void AddItem(const std::string& url_spec, ui::PageTransition transition) {

[Eugene But (OOO till 7-30), 2017/03/13 21:05:41]

This could be useful for other tests. Could you please move this to
web::TestNavigationManager

[pkl (ping after 24h if needed), 2017/03/14 02:12:48]

Moved to test_navigation_manager.mm

-    CRWSessionController* session_controller =
-        web_state_->GetNavigationManagerImpl().GetSessionController();
-    web_state_->GetNavigationManagerImpl().AddPendingItem(
-        GURL(url_spec), web::Referrer(), transition,
-        web::NavigationInitiationType::USER_INITIATED);
-    [session_controller commitPendingItem];
+    items_.push_back(web::NavigationItem::Create());
+    items_.back()->SetTransitionType(transition);
+    items_.back()->SetURL(GURL(url_spec));
   }
 
  private:
-  std::unique_ptr<web::WebStateImpl> web_state_;
+  web::ScopedNavigationItemList items_;
+};
+
+// Tests the implementation of IsLinkNavigation(). The function being tested
+// uses public NavigationManager interfaces and can be tested by using
+// TestNavigationManager that implements the same interface.
+class NativeAppNavigationUtilsTest : public PlatformTest {
+ protected:
+  void SetUp() override {
+    PlatformTest::SetUp();
+    std::unique_ptr<TestNavigationManager> test_navigation_manager =
+        base::MakeUnique<TestNavigationManager>();
+    test_navigation_manager_ = test_navigation_manager.get();
+    test_web_state_.SetNavigationManager(std::move(test_navigation_manager));
+  }
+
+  web::WebState* web_state() { return &test_web_state_; }
+
+  // Adds a navigation item of |transition| type to current WebState.
+  void AddItem(const std::string& url_spec, ui::PageTransition transition) {
+    test_navigation_manager_->AddItem(url_spec, transition);
+  }
+
+ private:
+  TestNavigationManager* test_navigation_manager_;
+  web::TestWebState test_web_state_;
 };
 
 // Tests that default state is not a link click.
 TEST_F(NativeAppNavigationUtilsTest, TestEmpty) {
   EXPECT_FALSE(native_app_launcher::IsLinkNavigation(web_state()));
 }
 
 // URL typed by user is not a link click.
 TEST_F(NativeAppNavigationUtilsTest, TestTypedUrl) {
   AddItem("http://foo.com/page0", ui::PAGE_TRANSITION_TYPED);
@@ skipping 30 matching lines @@
   EXPECT_TRUE(native_app_launcher::IsLinkNavigation(web_state()));
 }
 
 // The first non-redirect entry is tested. Earlier redirects do not matter.
 TEST_F(NativeAppNavigationUtilsTest, TestTypedUrlWithRedirectEarlier) {
   AddItem("http://foo.com/page0", ui::PAGE_TRANSITION_LINK);
   AddItem("http://bar.com/page1", ui::PAGE_TRANSITION_SERVER_REDIRECT);
   AddItem("http://blah.com/page2", ui::PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(native_app_launcher::IsLinkNavigation(web_state()));
 }
-
-}  // namespace