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

chrome/browser/ui/webui/omnibox/omnibox_ui_handler.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/ui/webui/omnibox/omnibox_ui_handler.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/string16.h"
@@ skipping 98 matching lines @@
     // type of text it is.
     output->SetString(item_prefix + ".description", it->description);
     // At this time, we're not bothering to send along the long vector that
     // represents description classification.  i.e., for each character, what
     // type of text it is.
     output->SetInteger(item_prefix + ".transition", it->transition);
     output->SetBoolean(item_prefix + ".is_history_what_you_typed_match",
                        it->is_history_what_you_typed_match);
     output->SetString(item_prefix + ".type",
                       AutocompleteMatch::TypeToString(it->type));
-    if (it->template_url != NULL)
-      output->SetString(item_prefix + ".template_url", it->template_url->url());
+    if ((it->template_url != NULL) && (it->template_url->url() != NULL)) {
+      output->SetString(item_prefix + ".template_url",
+                        it->template_url->url()->url());
+    }
     output->SetBoolean(item_prefix + ".starred", it->starred);
     output->SetBoolean(item_prefix + ".from_previous", it->from_previous);
   }
   output->SetInteger(prefix + ".num_items", i);
 }
 
 void OmniboxUIHandler::StartOmniboxQuery(
     const base::ListValue* one_element_input_string) {
   string16 input_string = ExtractStringValue(one_element_input_string);
   string16 empty_string;
   // Tell the autocomplete controller to start working on the
   // input.  It's okay if the previous request hasn't yet finished;
   // the autocomplete controller is smart enough to stop the previous
   // query before it starts the new one.  By the way, in this call to
   // Start(), we use the default/typical values for all parameters.
   time_omnibox_started_ = base::Time::Now();
   controller_->Start(input_string,
                      empty_string,  // user's desired tld (top-level domain)
                      false,  // don't prevent inline autocompletion
                      false,  // no preferred keyword provider
                      true,  // allow exact keyword matches
                      AutocompleteInput::ALL_MATCHES);  // want all matches
 }