Changes SearchProvider to set the description of the first consecutive

chrome/browser/autocomplete/autocomplete_edit.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/autocomplete/autocomplete_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 451 matching lines @@
     // treat this as a reload.
     match.transition = PageTransition::RELOAD;
   } else if (for_drop || ((paste_state_ != NONE) &&
                           match.is_history_what_you_typed_match)) {
     // When the user pasted in a URL and hit enter, score it like a link click
     // rather than a normal typed URL, so it doesn't get inline autocompleted
     // as aggressively later.
     match.transition = PageTransition::LINK;
   }
 
-  if (match.type == AutocompleteMatch::SEARCH_WHAT_YOU_TYPED ||
-      match.type == AutocompleteMatch::SEARCH_HISTORY ||
-      match.type == AutocompleteMatch::SEARCH_SUGGEST) {
-    const TemplateURL* default_provider =
-        TemplateURLServiceFactory::GetForProfile(profile_)->
-        GetDefaultSearchProvider();
-    if (default_provider && default_provider->url() &&
-        default_provider->url()->HasGoogleBaseURLs()) {
-      GoogleURLTracker::GoogleURLSearchCommitted();
+  if (match.template_url && match.template_url->url() &&
+      match.template_url->url()->HasGoogleBaseURLs()) {
+    GoogleURLTracker::GoogleURLSearchCommitted();
 #if defined(OS_WIN) && defined(GOOGLE_CHROME_BUILD)
-      // TODO(pastarmovj): Remove these metrics once we have proven that (close
-      // to) none searches that should have RLZ are sent out without one.
-      default_provider->url()->CollectRLZMetrics();
+    // TODO(pastarmovj): Remove these metrics once we have proven that (close
+    // to) none searches that should have RLZ are sent out without one.
+    match.template_url->url()->CollectRLZMetrics();
 #endif
-    }
   }
 
   view_->OpenMatch(match, disposition, alternate_nav_url,
                    AutocompletePopupModel::kNoMatch,
                    is_keyword_hint_ ? string16() : keyword_);
 }
 
 void AutocompleteEditModel::OpenMatch(const AutocompleteMatch& match,
                                       WindowOpenDisposition disposition,
                                       const GURL& alternate_nav_url,
@@ skipping 528 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }