Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak…

chrome/browser/autocomplete/autocomplete_edit.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_edit.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/metrics/histogram.h"
@@ skipping 477 matching lines @@
     match.transition = content::PAGE_TRANSITION_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 = content::PAGE_TRANSITION_LINK;
   }
 
   const TemplateURL* template_url = match.GetTemplateURL();
-  if (template_url && template_url->url_ref().HasGoogleBaseURLs()) {
+  if (template_url && template_url->url() &&
+      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.
     template_url->url()->CollectRLZMetrics();
 #endif
   }
 
   view_->OpenMatch(match, disposition, alternate_nav_url,
                    AutocompletePopupModel::kNoMatch);
@@ skipping 624 matching lines @@
 //  static
 bool AutocompleteEditModel::IsSpaceCharForAcceptingKeyword(wchar_t c) {
   switch (c) {
     case 0x0020:  // Space
     case 0x3000:  // Ideographic Space
       return true;
     default:
       return false;
   }
 }