Remove "Search" suffix from omnibox search engine match

Example (new on top, old on bottom): http://imgur.com/a/vx7pW

BUG=99426

Review URL: https://chromiumcodereview.appspot.com/16019014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203052 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/autocomplete/autocomplete_controller.cc

@@ -561,9 +561,14 @@ void AutocompleteController::UpdateKeywordDescriptions(
       if (i->keyword != last_keyword) {
         const TemplateURL* template_url = i->GetTemplateURL(profile_, false);
         if (template_url) {
+          // 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,
-              template_url->AdjustedShortNameForLocaleDirection());
+                IDS_AUTOCOMPLETE_SEARCH_DESCRIPTION, i->description);
+          }
           i->description_class.push_back(
               ACMatchClassification(0, ACMatchClassification::DIM));
         }