Tied up BlimpNavigationController to NavigationFeature

blimp/client/core/blimp_navigation_controller_impl_unittest.cc

 // Copyright 2016 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 "blimp/client/core/blimp_navigation_controller_impl.h"
 
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "blimp/client/core/blimp_navigation_controller_delegate.h"
+#include "blimp/client/feature/mock_navigation_feature.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+using testing::_;
+
 namespace blimp {
 namespace client {
 namespace {
 
 const GURL kExampleURL = GURL("https://www.example.com/");
 
 class TestBlimpNavigationControllerDelegate
     : public BlimpNavigationControllerDelegate {
  public:
   TestBlimpNavigationControllerDelegate() = default;
   ~TestBlimpNavigationControllerDelegate() override = default;
 
-  void NotifyURLLoaded(const GURL& url) override { last_loaded_url_ = url; }
+  void OnUrlChanged(const GURL& url) override { last_loaded_url_ = url; }
+  void OnFaviconChanged(const SkBitmap& favicon) override {}
+  void OnTitleChanged(const std::string& title) override {}
+  void OnLoadingChanged(bool loading) override {}
+  void OnPageLoadStatusUpdate(bool completed) override {}
 
   GURL GetLastLoadedURL() { return last_loaded_url_; }
 
  private:
   GURL last_loaded_url_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBlimpNavigationControllerDelegate);
 };
 
 TEST(BlimpNavigationControllerImplTest, Basic) {

[David Trainor- moved to gerrit, 2016/06/29 17:27:15]

Should we add a separate test for these extra calls?

   base::MessageLoop loop;
 
   TestBlimpNavigationControllerDelegate delegate;
   BlimpNavigationControllerImpl navigation_controller(&delegate);
 
+  MockNavigationFeature feature;
+  feature.SetDelegate(1, &navigation_controller);
+  navigation_controller.SetNavigationFeatureForTesting(&feature);
+
+  EXPECT_CALL(feature, GoBack(_)).Times(1);
+  EXPECT_CALL(feature, GoForward(_)).Times(1);
+  EXPECT_CALL(feature, Reload(_)).Times(1);
+
   navigation_controller.LoadURL(kExampleURL);
   EXPECT_EQ(kExampleURL, navigation_controller.GetURL());
 
+  navigation_controller.GoBack();
+  navigation_controller.GoForward();
+  navigation_controller.Reload();
+
   loop.RunUntilIdle();
   EXPECT_EQ(kExampleURL, delegate.GetLastLoadedURL());
 }
 
 }  // namespace
 }  // namespace client
 }  // namespace blimp