Fix a DCHECK failure in AutocompleteEditModel::OnPopupDataChanged()

chrome/browser/search_engines/template_url_model.h

Index: chrome/browser/search_engines/template_url_model.h
diff --git a/chrome/browser/search_engines/template_url_model.h b/chrome/browser/search_engines/template_url_model.h
index 504e79f79a3a2488a1d0d995b627362fe3311886..b25da9b32ff62c088e7085e344dbfb54302f2b7a 100644
--- a/chrome/browser/search_engines/template_url_model.h
+++ b/chrome/browser/search_engines/template_url_model.h
@@ -59,6 +59,7 @@ class TemplateURLModel : public WebDataServiceConsumer,
                          public NotificationObserver {
  public:
   typedef std::map<std::string, std::string> QueryTerms;
+  typedef std::vector<const TemplateURL*> TemplateURLVector;
 
   // Struct used for initializing the data store with fake data.
   // Each initializer is mapped to a TemplateURL.
@@ -157,7 +158,7 @@ class TemplateURLModel : public WebDataServiceConsumer,
 
   // Returns the set of URLs describing the keywords. The elements are owned
   // by TemplateURLModel and should not be deleted.
-  std::vector<const TemplateURL*> GetTemplateURLs() const;
+  TemplateURLVector GetTemplateURLs() const;
 
   // Increment the usage count of a keyword.
   // Called when a URL is loaded that was generated from a keyword.
@@ -258,7 +259,6 @@ class TemplateURLModel : public WebDataServiceConsumer,
   friend class TemplateURLModelTestUtil;
 
   typedef std::map<string16, const TemplateURL*> KeywordToTemplateMap;
-  typedef std::vector<const TemplateURL*> TemplateURLVector;
 
   // Helper functor for FindMatchingKeywords(), for finding the range of
   // keywords which begin with a prefix.