Tied up BlimpNavigationController to NavigationFeature

blimp/client/core/contents/navigation_feature.cc

 // 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.
 
-#include "blimp/client/feature/navigation_feature.h"
+#include "blimp/client/core/contents/navigation_feature.h"
 
 #include <map>
 #include <string>
 
 #include "blimp/common/create_blimp_message.h"
 #include "blimp/common/proto/blimp_message.pb.h"
 #include "blimp/common/proto/navigation.pb.h"
 #include "components/url_formatter/url_fixer.h"
 #include "net/base/net_errors.h"
 #include "url/gurl.h"
@@ skipping 12 matching lines @@
   outgoing_message_processor_ = std::move(processor);
 }
 
 void NavigationFeature::SetDelegate(int tab_id,
                                     NavigationFeatureDelegate* delegate) {
   DCHECK(!FindDelegate(tab_id));
   delegates_[tab_id] = delegate;
 }
 
 void NavigationFeature::RemoveDelegate(int tab_id) {
-  DelegateMap::iterator it = delegates_.find(tab_id);
+  auto it = delegates_.find(tab_id);
   if (it != delegates_.end())
     delegates_.erase(it);
 }
 
 void NavigationFeature::NavigateToUrlText(int tab_id,
                                           const std::string& url_text) {
   // Fixes up url, e.g., convert "google.com" to "http://google.com".
   // It also converts "example" to "http://example/" (a valid GURL but no
   // website). In order to use search instead in this case, we check
   // the host part of the URL to see if it contains '.', and use search
@@ skipping 71 matching lines @@
         delegate->OnTitleChanged(tab_id, details.title());
 
       if (details.has_loading())
         delegate->OnLoadingChanged(tab_id, details.loading());
 
       if (details.has_favicon()) {
         NOTIMPLEMENTED();
       }
 
       if (details.has_page_load_completed()) {
-        delegate->OnPageLoadStatusUpdate(tab_id,
-                                         details.page_load_completed());
+        delegate->OnPageLoadStatusUpdate(tab_id, details.page_load_completed());
       }
     } break;
     case NavigationMessage::LOAD_URL:
     case NavigationMessage::GO_BACK:
     case NavigationMessage::GO_FORWARD:
     case NavigationMessage::RELOAD:
       NOTREACHED() << "Client received unexpected navigation type.";
       break;
     case NavigationMessage::UNKNOWN:
       NOTREACHED();
   }
 
   callback.Run(net::OK);
 }
 
 NavigationFeature::NavigationFeatureDelegate* NavigationFeature::FindDelegate(
     const int tab_id) {
-  DelegateMap::const_iterator it = delegates_.find(tab_id);
+  base::SmallMap<std::map<int, NavigationFeatureDelegate*>>::const_iterator it =
+      delegates_.find(tab_id);
   if (it != delegates_.end())
     return it->second;
   return nullptr;
 }
 
 }  // namespace client
 }  // namespace blimp