Move the URL string from TemplateURLRef onto the owning TemplateURL. This will make it easier to m…

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
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=130431

[Peter Kasting, 2012-03-30 16:25:38]

sky: review
mnissler: chrome/browser/policy/ OWNERS
atwilson: chrome/browser/sync/ OWNERS

[sky, 2012-03-30 16:45:13]

LGTM

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/importer...
File chrome/browser/importer/firefox_importer_utils.cc (right):

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/importer...
chrome/browser/importer/firefox_importer_utils.cc:206: std::string
url(template_url->url());
const std::string&

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/search_e...
File chrome/browser/search_engines/template_url.h (right):

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/search_e...
chrome/browser/search_engines/template_url.h:218: Type type_;
const (wow, I'm suggesting you make something const!)

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/search_e...
File chrome/browser/search_engines/template_url_service_sync_unittest.cc
(right):

https://chromiumcodereview.appspot.com/9968016/diff/1/chrome/browser/search_e...
chrome/browser/search_engines/template_url_service_sync_unittest.cc:101: return
!!change_map_.count(guid);
nit: !! is a bit obscure.

[sky, 2012-03-30 22:00:28]

http://codereview.chromium.org/9968016/diff/1/chrome/browser/instant/instant_...
File chrome/browser/instant/instant_controller.cc (left):

http://codereview.chromium.org/9968016/diff/1/chrome/browser/instant/instant_...
chrome/browser/instant/instant_controller.cc:532: return template_url &&
template_url->instant_url() && template_url->id() &&
I think we should keep this id() check. During startup the id() may not be set,
which I think can cause problems later on.

[Mattias Nissler (ping if slow), 2012-04-02 19:23:17]

chrome/browser/policy LGTM

[Andrew T Wilson (Slow), 2012-04-02 20:19:41]

browser/sync LGTM