chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc - Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data.

Unified Diff: chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

Issue 268643002: Use the DefaultSearchManager as the exclusive authority on DSE, ignoring Web Data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Review comments. Created 6 years, 7 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/profile_resetter/automatic_profile_resetter_delegate.h ('k') | chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc » ('j') | chrome/browser/profile_resetter/automatic_profile_resetter_delegate_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

diff --git a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

index b2515fcda7dfd8808fd0b114779dcf2dfbb89fba..a974b087230f4b78e166170b4566661a033feff7 100644

--- a/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

+++ b/chrome/browser/profile_resetter/automatic_profile_resetter_delegate.cc

@@ -51,30 +51,42 @@ scoped_ptr<base::DictionaryValue> BuildSubTreeFromTemplateURL(

// TemplateURLData if possible."

tree->SetString("search_terms_replacement_key",

template_url->search_terms_replacement_key());

- tree->SetString("suggest_url", template_url->suggestions_url());

+ tree->SetString("suggestions_url", template_url->suggestions_url());

tree->SetString("instant_url", template_url->instant_url());

tree->SetString("image_url", template_url->image_url());

tree->SetString("new_tab_url", template_url->new_tab_url());

tree->SetString("search_url_post_params",

template_url->search_url_post_params());

- tree->SetString("suggest_url_post_params",

+ tree->SetString("suggestions_url_post_params",

template_url->suggestions_url_post_params());

tree->SetString("instant_url_post_params",

template_url->instant_url_post_params());

tree->SetString("image_url_post_params",

template_url->image_url_post_params());

- tree->SetString("icon_url", template_url->favicon_url().spec());

+ tree->SetString("favicon_url", template_url->favicon_url().spec());

tree->SetString("name", template_url->short_name());

tree->SetString("keyword", template_url->keyword());

base::ListValue* input_encodings = new base::ListValue;

input_encodings->AppendStrings(template_url->input_encodings());

- tree->Set("encodings", input_encodings);

+ tree->Set("input_encodings", input_encodings);

tree->SetString("id", base::Int64ToString(template_url->id()));

- tree->SetString("prepopulate_id",

- base::IntToString(template_url->prepopulate_id()));

+ tree->SetInteger("prepopulate_id", template_url->prepopulate_id());

base::ListValue* alternate_urls = new base::ListValue;

alternate_urls->AppendStrings(template_url->alternate_urls());

tree->Set("alternate_urls", alternate_urls);

+ tree->SetBoolean("created_by_policy", template_url->created_by_policy());

+ tree->SetString("date_created",

+ base::Int64ToString(

+ template_url->date_created().ToInternalValue()));

+ tree->SetString("last_modified",

+ base::Int64ToString(

+ template_url->last_modified().ToInternalValue()));

+ tree->SetString("originating_url", template_url->originating_url().spec());

+ tree->SetBoolean("safe_for_autoreplace",

+ template_url->safe_for_autoreplace());

+ tree->SetString("short_name", template_url->short_name());

+ tree->SetString("url", template_url->url());

+ tree->SetInteger("usage_count", template_url->usage_count());

Peter Kasting 2014/05/07 23:38:29 Nit: This list of keys is in a seemingly random or

erikwright (departed) 2014/05/08 12:46:24 Done.

return tree.Pass();

}