Reland r131019: Move most TemplateURL data members to a new struct, TemplateURLData. This allows us…

chrome/browser/importer/ie_importer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/importer/ie_importer.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <pstore.h>
 #include <shlobj.h>
@@ skipping 566 matching lines @@
         continue;
       }
     }
 
     std::string url(WideToUTF8(wide_url));
     SearchEnginesMap::iterator t_iter = search_engines_map.find(url);
     if (t_iter == search_engines_map.end()) {
       // First time we see that URL.
       GURL gurl(url);
       if (gurl.is_valid()) {
-        TemplateURL* template_url = new TemplateURL();
-        template_url->set_short_name(name);
-        template_url->SetURL(url);
-        // Give this a keyword to facilitate tab-to-search, if possible.
-        template_url->set_keyword(TemplateURLService::GenerateKeyword(gurl,
-                                                                      false));
-        template_url->set_show_in_default_list(true);
-        search_engines_map.insert(std::make_pair(url, template_url));
+        TemplateURLData data;
+        data.short_name = name;
+        data.SetKeyword(TemplateURLService::GenerateKeyword(gurl, false));
+        data.SetURL(url);
+        data.show_in_default_list = true;
+        t_iter = search_engines_map.insert(std::make_pair(url,
+            new TemplateURL(data))).first;
       }
     }
   }
 
   // ProfileWriter::AddKeywords() requires a vector and we have a map.
   std::vector<TemplateURL*> search_engines;
   for (SearchEnginesMap::iterator i = search_engines_map.begin();
        i != search_engines_map.end(); ++i)
     search_engines.push_back(i->second);
 
@@ skipping 148 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }