Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6071)

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 9965143: Revert 130431 - Move the URL string from TemplateURLRef onto the owning TemplateURL. This will mak… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/automation/testing_automation_provider.cc
===================================================================
--- chrome/browser/automation/testing_automation_provider.cc (revision 130565)
+++ chrome/browser/automation/testing_automation_provider.cc (working copy)
@@ -3371,14 +3371,14 @@
search_engine->SetBoolean("in_default_list", (*it)->ShowInDefaultList());
search_engine->SetBoolean("is_default",
(*it) == url_model->GetDefaultSearchProvider());
- search_engine->SetBoolean("is_valid", (*it)->url_ref().IsValid());
+ search_engine->SetBoolean("is_valid", (*it)->url()->IsValid());
search_engine->SetBoolean("supports_replacement",
- (*it)->url_ref().SupportsReplacement());
- search_engine->SetString("url", (*it)->url());
- search_engine->SetString("host", (*it)->url_ref().GetHost());
- search_engine->SetString("path", (*it)->url_ref().GetPath());
+ (*it)->url()->SupportsReplacement());
+ search_engine->SetString("url", (*it)->url()->url());
+ search_engine->SetString("host", (*it)->url()->GetHost());
+ search_engine->SetString("path", (*it)->url()->GetPath());
search_engine->SetString("display_url",
- UTF16ToUTF8((*it)->url_ref().DisplayURL()));
+ UTF16ToUTF8((*it)->url()->DisplayURL()));
search_engines->Append(search_engine);
}
return_value->Set("search_engines", search_engines);
« no previous file with comments | « chrome/browser/autocomplete/search_provider_unittest.cc ('k') | chrome/browser/chrome_browser_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698