|  | Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us to eliminate the TemplateURL NULL constructor, most public non-const TemplateURL functions, and most TemplateURL friend declarations.
This is also a necessary precursor to changing TemplateURLService's APIs to convert most "const TemplateURL*" cases to "TemplateURL*", which I'll explain once I actually make the change.
There is some awkwardness here around keywords, as keyword autogeneration requires a TemplateURL but the state bits are kept on TemplateURLData. This will go away in the future when I remove keyword autogeneration from TemplateURL entirely.
This differs from r131019 in that it fixes a memory error in chrome/browser/search_engines/util.cc:MergeEnginesFromPrepopulateData() where when we updated the vector to contain a new TemplateURL*, we didn't also update |default_search_engine| to point at the new URL if necessary.
BUG=none
TEST=none
TBR=sky,mnissler,atwilson
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=131224
    
  
  
    
      |  | Unified diffs | Side-by-side diffs | Delta from patch set | Stats (+1355 lines, -1395 lines) | Patch |  
        |  | M | chrome/browser/autocomplete/autocomplete_unittest.cc | View |  | 3 chunks | +16 lines, -14 lines | 0 comments | Download |  
        |  | M | chrome/browser/autocomplete/keyword_provider_unittest.cc | View |  | 1 chunk | +5 lines, -5 lines | 0 comments | Download |  
        |  | M | chrome/browser/autocomplete/search_provider.h | View |  | 1 chunk | +6 lines, -1 line | 0 comments | Download |  
        |  | M | chrome/browser/autocomplete/search_provider_unittest.cc | View |  | 2 chunks | +10 lines, -9 lines | 0 comments | Download |  
        |  | M | chrome/browser/importer/firefox2_importer.cc | View |  | 1 chunk | +5 lines, -5 lines | 0 comments | Download |  
        |  | M | chrome/browser/importer/firefox_importer_utils.cc | View |  | 2 chunks | +2 lines, -3 lines | 0 comments | Download |  
        |  | M | chrome/browser/importer/ie_importer.cc | View |  | 1 chunk | +7 lines, -8 lines | 0 comments | Download |  
        |  | M | chrome/browser/importer/profile_import_process_messages.h | View |  | 2 chunks | +61 lines, -58 lines | 0 comments | Download |  
        |  | M | chrome/browser/instant/instant_browsertest.cc | View |  | 1 chunk | +8 lines, -12 lines | 0 comments | Download |  
        |  | M | chrome/browser/policy/configuration_policy_handler.cc | View |  | 1 chunk | +3 lines, -3 lines | 0 comments | Download |  
        |  | M | chrome/browser/protector/default_search_provider_change_browsertest.cc | View |  | 9 chunks | +20 lines, -25 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/search_host_to_urls_map.h | View |  | 1 chunk | +0 lines, -7 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/search_host_to_urls_map.cc | View |  | 1 chunk | +0 lines, -17 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/search_host_to_urls_map_unittest.cc | View |  | 4 chunks | +11 lines, -21 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/search_provider_install_data_unittest.cc | View |  | 1 chunk | +5 lines, -4 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url.h | View |  | 3 chunks | +160 lines, -174 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url.cc | View |  | 4 chunks | +81 lines, -111 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_fetcher.cc | View |  | 3 chunks | +10 lines, -9 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_fetcher_unittest.cc | View |  | 1 chunk | +5 lines, -5 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_parser.h | View |  | 1 chunk | +1 line, -0 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_parser.cc | View |  | 13 chunks | +30 lines, -25 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_parser_unittest.cc | View |  | 1 chunk | +1 line, -1 line | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_prepopulate_data.cc | View |  | 3 chunks | +19 lines, -21 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_service.h | View |  | 3 chunks | +13 lines, -9 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_service.cc | View |  | 29 chunks | +160 lines, -156 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_service_sync_unittest.cc | View |  | 7 chunks | +30 lines, -26 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_service_unittest.cc | View |  | 41 chunks | +168 lines, -170 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/template_url_unittest.cc | View |  | 26 chunks | +108 lines, -79 lines | 0 comments | Download |  
        |  | M | chrome/browser/search_engines/util.cc | View |  | 5 chunks | +51 lines, -40 lines | 0 comments | Download |  
        |  | M | chrome/browser/sync/test/integration/search_engines_helper.h | View |  | 1 chunk | +1 line, -1 line | 0 comments | Download |  
        |  | M | chrome/browser/sync/test/integration/search_engines_helper.cc | View |  | 1 chunk | +14 lines, -14 lines | 0 comments | Download |  
        |  | M | chrome/browser/sync/test/integration/single_client_search_engines_sync_test.cc | View |  | 2 chunks | +3 lines, -9 lines | 0 comments | Download |  
        |  | M | chrome/browser/sync/test/integration/two_client_search_engines_sync_test.cc | View |  | 2 chunks | +1 line, -2 lines | 0 comments | Download |  
        |  | M | chrome/browser/tab_contents/render_view_context_menu.cc | View |  | 1 chunk | +10 lines, -11 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/cocoa/browser/edit_search_engine_cocoa_controller_unittest.mm | View |  | 1 chunk | +5 lines, -4 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc | View |  | 3 chunks | +15 lines, -18 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/search_engines/edit_search_engine_controller.cc | View |  | 3 chunks | +8 lines, -12 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc | View |  | 1 chunk | +4 lines, -3 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/search_engines/search_engine_tab_helper.cc | View |  | 2 chunks | +8 lines, -9 lines | 0 comments | Download |  
        |  | M | chrome/browser/ui/search_engines/template_url_table_model.cc | View |  | 1 chunk | +5 lines, -4 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/keyword_table.h | View |  | 6 chunks | +22 lines, -17 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/keyword_table.cc | View |  | 5 chunks | +54 lines, -59 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/keyword_table_unittest.cc | View |  | 12 chunks | +190 lines, -195 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/web_data_service.h | View |  | 5 chunks | +7 lines, -7 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/web_data_service.cc | View |  | 4 chunks | +11 lines, -11 lines | 0 comments | Download |  
        |  | M | chrome/browser/webdata/web_data_service_unittest.cc | View |  | 1 chunk | +1 line, -1 line | 0 comments | Download |  
    Total messages: 2 (0 generated)
     |