Don't treat input with a scheme that's not "http" or "https" as a potential k...

chrome/browser/autocomplete/keyword_provider.cc

 // Copyright (c) 2010 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/keyword_provider.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "app/l10n_util.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_omnibox_api.h"
 #include "chrome/browser/extensions/extensions_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "net/base/escape.h"
 #include "net/base/net_util.h"
 
 // Helper functor for Start(), for ending keyword mode unless explicitly told
 // otherwise.
 class KeywordProvider::ScopedEndExtensionKeywordMode {
  public:
-  ScopedEndExtensionKeywordMode(KeywordProvider* provider)
+  explicit ScopedEndExtensionKeywordMode(KeywordProvider* provider)
       : provider_(provider) { }
   ~ScopedEndExtensionKeywordMode() {
     if (provider_)
       provider_->MaybeEndExtensionKeywordMode();
   }
 
   void StayInKeywordMode() {
     provider_ = NULL;
   }
  private:
@@ skipping 132 matching lines @@
   if (keyword_matches.empty())
     return;
   std::sort(keyword_matches.begin(), keyword_matches.end(), CompareQuality());
 
   // Limit to one exact or three inexact matches, and mark them up for display
   // in the autocomplete popup.
   // Any exact match is going to be the highest quality match, and thus at the
   // front of our vector.
   if (keyword_matches.front() == keyword) {
     const TemplateURL* template_url(model->GetTemplateURLForKeyword(keyword));
+    // TODO(pkasting): We should probably check that if the user explicitly
+    // typed a scheme, that scheme matches the one in |template_url|.
+
     if (profile_ &&
         !input.synchronous_only() && template_url->IsExtensionKeyword()) {
       // If this extension keyword is disabled, make sure we don't add any
       // matches (including the synchronous one below).
       ExtensionsService* service = profile_->GetExtensionsService();
       Extension* extension = service->GetExtensionById(
           template_url->GetExtensionId(), false);
       bool enabled = extension && (!profile_->IsOffTheRecord() ||
                                    service->IsIncognitoEnabled(extension));
       if (!enabled)
@@ skipping 275 matching lines @@
 }
 
 void KeywordProvider::MaybeEndExtensionKeywordMode() {
   if (!current_keyword_extension_id_.empty()) {
     ExtensionOmniboxEventRouter::OnInputCancelled(
         profile_, current_keyword_extension_id_);
 
     current_keyword_extension_id_.clear();
   }
 }