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

chrome/browser/webdata/keyword_table.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/webdata/keyword_table.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/stats_counters.h"
@@ skipping 43 matching lines @@
 void BindURLToStatement(const TemplateURL& url,
                         sql::Statement* s,
                         int id_column,
                         int starting_column) {
   s->BindInt64(id_column, url.id());
   s->BindString16(starting_column, url.short_name());
   s->BindString16(starting_column + 1, url.keyword());
   s->BindString(starting_column + 2, url.favicon_url().is_valid() ?
       history::HistoryDatabase::GURLToDatabaseURL(url.favicon_url()) :
       std::string());
-  s->BindString(starting_column + 3, url.url());
+  s->BindString(starting_column + 3,
+                url.url() ? url.url()->url() : std::string());
   s->BindBool(starting_column + 4, url.safe_for_autoreplace());
   s->BindString(starting_column + 5, url.originating_url().is_valid() ?
       history::HistoryDatabase::GURLToDatabaseURL(url.originating_url()) :
       std::string());
   s->BindInt64(starting_column + 6, url.date_created().ToTimeT());
   s->BindInt(starting_column + 7, url.usage_count());
   s->BindString(starting_column + 8, JoinString(url.input_encodings(), ';'));
   s->BindBool(starting_column + 9, url.show_in_default_list());
-  s->BindString(starting_column + 10, url.suggestions_url());
+  s->BindString(starting_column + 10,
+      url.suggestions_url() ? url.suggestions_url()->url() : std::string());
   s->BindInt(starting_column + 11, url.prepopulate_id());
   s->BindInt(starting_column + 12, url.autogenerate_keyword() ? 1 : 0);
   s->BindInt(starting_column + 13, 0);
   s->BindBool(starting_column + 14, url.created_by_policy());
-  s->BindString(starting_column + 15, url.instant_url());
+  s->BindString(starting_column + 15,
+                url.instant_url() ? url.instant_url()->url() : std::string());
   s->BindInt64(starting_column + 16, url.last_modified().ToTimeT());
   s->BindString(starting_column + 17, url.sync_guid());
 }
 
 // Signs search provider id and returns its signature.
 std::string GetSearchProviderIDSignature(int64 id) {
   return protector::SignSetting(base::Int64ToString(id));
 }
 
 // Checks if signature for search provider id is correct and returns the
@@ skipping 374 matching lines @@
   int64 default_search_id = GetDefaultSearchProviderID();
   if (!meta_table_->SetValue(kDefaultSearchIDBackupKey,
                              default_search_id)) {
     LOG(ERROR) << "Can't write default search id backup.";
     return false;
   }
 
   *id = default_search_id;
   return true;
 }