Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to move the data members of TemplateURL into a new class later.

This changes the accessors for TemplateURL's TemplateURLRefs.  There are now separate accessors for the URLs as strings and as TemplateURLRefs, and the latter have changed to returning a const ref, meaning they no longer return NULL when the corresponding URL string is empty.  This makes a number of callers clearer.

BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/9968016

TBR=pkasting@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9965143

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

1 files changed, 6 insertions, 3 deletions

diff --git a/chrome/browser/webdata/keyword_table.cc b/chrome/browser/webdata/keyword_table.cc
index c8cd84f..879601f 100644
--- a/chrome/browser/webdata/keyword_table.cc
+++ b/chrome/browser/webdata/keyword_table.cc
@@ -61,7 +61,8 @@ void BindURLToStatement(const TemplateURL& url,
   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()) :
@@ -70,12 +71,14 @@ void BindURLToStatement(const TemplateURL& url,
   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());
 }