Tied up BlimpNavigationController to NavigationFeature

blimp/client/feature/navigation_feature.h

 // Copyright 2015 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.
 
 #ifndef BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_

[nyquist, 2016/07/25 22:59:06]

Can this be moved to //blimp/client/core/contents?

 #define BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_
 
 #include <map>
 #include <string>
 
 #include "base/containers/small_map.h"
 #include "base/macros.h"
 #include "blimp/net/blimp_message_processor.h"
 
 class GURL;
@@ skipping 25 matching lines @@
   // Set the BlimpMessageProcessor that will be used to send
   // BlimpMessage::NAVIGATION messages to the engine.
   void set_outgoing_message_processor(
       std::unique_ptr<BlimpMessageProcessor> processor);
 
   // Sets a NavigationMessageDelegate to be notified of all navigation messages
   // for |tab_id| from the engine.
   void SetDelegate(int tab_id, NavigationFeatureDelegate* delegate);
   void RemoveDelegate(int tab_id);
 
-  void NavigateToUrlText(int tab_id, const std::string& url_text);
-  void Reload(int tab_id);
-  void GoForward(int tab_id);
-  void GoBack(int tab_id);
+  // virtual for testing.

[David Trainor- moved to gerrit, 2016/07/25 15:57:32]

Do we want to test this to/from the proto level like we did on 0.5?  If not this
is ok.  Just curious.

[shaktisahu, 2016/07/26 01:25:27]

I wanted to test that the feature is getting called. Also mocking out this class
gives a way to test the path from BlimpContents to its observers. I think the
proto layer is adequately tested in the navigation_feature_unittest.cc. 

+  virtual void NavigateToUrlText(int tab_id, const std::string& url_text);
+  virtual void Reload(int tab_id);
+  virtual void GoForward(int tab_id);
+  virtual void GoBack(int tab_id);
 
   // BlimpMessageProcessor implementation.
   void ProcessMessage(std::unique_ptr<BlimpMessage> message,
                       const net::CompletionCallback& callback) override;
 
- private:
+ protected:
+  // Finds the NavigationFeatureDelegate for a |tab_id|, protected for unit
+  // tests.
   NavigationFeatureDelegate* FindDelegate(const int tab_id);
 
+ private:
   typedef base::SmallMap<std::map<int, NavigationFeatureDelegate*>> DelegateMap;
 
   DelegateMap delegates_;
 
   // Used to send BlimpMessage::NAVIGATION messages to the engine.
   std::unique_ptr<BlimpMessageProcessor> outgoing_message_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationFeature);
 };
 
 }  // namespace client
 }  // namespace blimp
 
 #endif  // BLIMP_CLIENT_FEATURE_NAVIGATION_FEATURE_H_