Rename NavigationController to NavigationControllerImpl and put it into the content namespace. Al...

chrome/browser/safe_browsing/browser_feature_extractor.cc

 // Copyright (c) 2011 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 "chrome/browser/safe_browsing/browser_feature_extractor.h"
 
 #include <map>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 10 matching lines @@
 #include "chrome/browser/safe_browsing/browser_features.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
+using content::NavigationEntry;
 using content::WebContents;
 
 namespace safe_browsing {
 
 BrowseInfo::BrowseInfo() : http_status_code(0) {}
 
 BrowseInfo::~BrowseInfo() {}
 
 static void AddFeature(const std::string& feature_name,
                        double feature_value,
                        ClientPhishingRequest* request) {
   DCHECK(request);
   ClientPhishingRequest::Feature* feature =
       request->add_non_model_feature_map();
   feature->set_name(feature_name);
   feature->set_value(feature_value);
   VLOG(2) << "Browser feature: " << feature->name() << " " << feature->value();
 }
 
 static void AddNavigationFeatures(const std::string& feature_prefix,
                                   const NavigationController& controller,
                                   int index,
                                   const std::vector<GURL>& redirect_chain,
                                   ClientPhishingRequest* request) {
-  content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+  NavigationEntry* entry = controller.GetEntryAtIndex(index);
   bool is_secure_referrer = entry->GetReferrer().url.SchemeIsSecure();
   if (!is_secure_referrer) {
     AddFeature(StringPrintf("%s%s=%s",
                             feature_prefix.c_str(),
                             features::kReferrer,
                             entry->GetReferrer().url.spec().c_str()),
                1.0,
                request);
   }
   AddFeature(feature_prefix + features::kHasSSLReferrer,
@@ skipping 89 matching lines @@
   // Extract features pertaining to this navigation.
   const NavigationController& controller = tab_->GetController();
   int url_index = -1;
   int first_host_index = -1;
 
   GURL request_url(request->url());
   int index = controller.GetCurrentEntryIndex();
   // The url that we are extracting features for should already be commited.
   DCHECK_NE(index, -1);
   for (; index >= 0; index--) {
-    content::NavigationEntry* entry = controller.GetEntryAtIndex(index);
+    NavigationEntry* entry = controller.GetEntryAtIndex(index);
     if (url_index == -1 && entry->GetURL() == request_url) {
       // It's possible that we've been on the on the possibly phishy url before
       // in this tab, so make sure that we use the latest navigation for
       // features.
       // Note that it's possible that the url_index should always be the
       // latest entry, but I'm worried about possible races during a navigation
       // and transient entries (i.e. interstiatials) so for now we will just
       // be cautious.
       url_index = index;
     } else if (index < url_index) {
@@ skipping 264 matching lines @@
     *history = profile->GetHistoryService(Profile::EXPLICIT_ACCESS);
     if (*history) {
       return true;
     }
   }
   VLOG(2) << "Unable to query history.  No history service available.";
   return false;
 }
 
 }  // namespace safe_browsing