Fix issue 5806. If the suggest server returns a NAVIGATION...

chrome/browser/autocomplete/search_provider.cc

 // Copyright (c) 2006-2008 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/autocomplete/search_provider.h"
 
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google_util.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/template_url_model.h"
+#include "chrome/browser/url_fixer_upper.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "googleurl/src/url_util.h"
 #include "net/base/escape.h"
 
 #include "generated_resources.h"
 
 using base::Time;
@@ skipping 291 matching lines @@
     Value* type_val;
     std::wstring type_str;
     if (type_list && type_list->Get(i, &type_val) &&
         type_val->GetAsString(&type_str) && (type_str == L"NAVIGATION")) {
       Value* site_val;
       std::wstring site_name;
       if (navigation_results_.size() < max_matches() &&
           description_list && description_list->Get(i, &site_val) &&
           site_val->IsType(Value::TYPE_STRING) &&
           site_val->GetAsString(&site_name)) {
-        navigation_results_.push_back(NavigationResult(GURL(suggestion_str),
-                                                       site_name));
+        // Navigation links might not be valid URLs. For example, the Google
+        // suggest server returns navigation links without a scheme if the
+        // scheme is http. Fix the URL, and verify that it's valid before
+        // adding it to the list.
+        GURL result_url = GURL(URLFixerUpper::FixupURL(suggestion_str, L""));
+        if (result_url.is_valid()) {
+          navigation_results_.push_back(NavigationResult(result_url,
+              site_name));
+        }
       }
     } else {
       // TODO(kochi): Currently we treat a calculator result as a query, but it
       // is better to have better presentation for caluculator results.
       if (suggest_results_.size() < max_matches())
         suggest_results_.push_back(suggestion_str);
     }
   }
 
   return true;
@@ skipping 269 matching lines @@
   const size_t after_slashes = std::min(url->length(),
                                         static_cast<size_t>(scheme.end() + 3));
   while ((prefix_len < after_slashes) && ((*url)[prefix_len] == L'/'))
     ++prefix_len;
   if (prefix_len == url->length())
     url->clear();
   else
     url->erase(url->begin(), url->begin() + prefix_len);
   return prefix_len;
 }