Remove "Search" suffix from omnibox search engine match

chrome/browser/autocomplete/autocomplete_controller.cc

 // Copyright (c) 2012 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/autocomplete_controller.h"
 
 #include <set>
 #include <string>
 
 #include "base/command_line.h"
@@ skipping 543 matching lines @@
     if ((i->provider->type() == AutocompleteProvider::TYPE_KEYWORD &&
          !i->keyword.empty()) ||
         (i->provider->type() == AutocompleteProvider::TYPE_SEARCH &&
          AutocompleteMatch::IsSearchType(i->type))) {
       i->description.clear();
       i->description_class.clear();
       DCHECK(!i->keyword.empty());
       if (i->keyword != last_keyword) {
         const TemplateURL* template_url = i->GetTemplateURL(profile_, false);
         if (template_url) {
-          i->description = l10n_util::GetStringFUTF16(
-              IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION,
-              template_url->AdjustedShortNameForLocaleDirection());
+          // For extension keywords, just make the description the extension
+          // name -- don't assume that the normal search keyword description is
+          // applicable.
+          i->description = template_url->AdjustedShortNameForLocaleDirection();
+          if (!template_url->IsExtensionKeyword()) {
+            i->description = l10n_util::GetStringFUTF16(
+                IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION, i->description);
+          }
           i->description_class.push_back(
               ACMatchClassification(0, ACMatchClassification::DIM));
         }
         last_keyword = i->keyword;
       }
     } else {
       last_keyword.clear();
     }
   }
 }
@@ skipping 51 matching lines @@
   // it to the edit model / dropdown display code.
   if (!chrome::IsInstantExtendedAPIEnabled() &&
       !chrome::IsInstantEnabled(profile_)) {
     stop_timer_.Start(FROM_HERE,
                       base::TimeDelta::FromMilliseconds(kStopTimeMS),
                       base::Bind(&AutocompleteController::Stop,
                                  base::Unretained(this),
                                  false));
   }
 }