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

chrome/browser/autocomplete/search_provider.h

Index: chrome/browser/autocomplete/search_provider.h
===================================================================
--- chrome/browser/autocomplete/search_provider.h	(revision 131175)
+++ chrome/browser/autocomplete/search_provider.h	(working copy)
@@ -90,7 +90,12 @@
   // . The keyword provider. This is used if the user has typed in a keyword.
   class Providers {
    public:
-    Providers() : default_provider_(NULL), keyword_provider_(NULL) {}
+    Providers()
+        : cached_default_provider_(TemplateURLData()),
+          cached_keyword_provider_(TemplateURLData()),
+          default_provider_(NULL),
+          keyword_provider_(NULL) {
+    }
 
     // Returns true if the specified providers match the two providers managed
     // by this class.