Fix a DCHECK failure in AutocompleteEditModel::OnPopupDataChanged()

chrome/browser/search_engines/template_url_model.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_
 #pragma once
 
 #include <map>
 #include <set>
@@ skipping 41 matching lines @@
 // notification message.
 //
 // TemplateURLModel takes ownership of any TemplateURL passed to it. If there
 // is a WebDataService, deletion is handled by WebDataService, otherwise
 // TemplateURLModel handles deletion.
 
 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.
   struct Initializer {
     const char* const keyword;
     const char* const url;
     const char* const content;
   };
 
   explicit TemplateURLModel(Profile* profile);
@@ skipping 78 matching lines @@
   void UnregisterExtensionKeyword(const Extension* extension);
 
   // Returns the TemplateURL associated with the keyword for this extension.
   // This works by checking the extension ID, not the keyword, so it will work
   // even if the user changed the keyword.
   const TemplateURL* GetTemplateURLForExtension(
       const Extension* extension) const;
 
   // 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.
   void IncrementUsageCount(const TemplateURL* url);
 
   // Resets the title, keyword and search url of the specified TemplateURL.
   // The TemplateURL is marked as not replaceable.
   void ResetTemplateURL(const TemplateURL* url,
                         const string16& title,
                         const string16& keyword,
@@ skipping 80 matching lines @@
   FRIEND_TEST_ALL_PREFIXES(TemplateURLModelTest, TestManagedDefaultSearch);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLModelTest,
                            UpdateKeywordSearchTermsForURL);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLModelTest,
                            DontUpdateKeywordSearchForNonReplaceable);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLModelTest, ChangeGoogleBaseValue);
   FRIEND_TEST_ALL_PREFIXES(TemplateURLModelTest, MergeDeletesUnusedProviders);
   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.
   class LessWithPrefix;
 
   void Init(const Initializer* initializers, int num_initializers);
 
   void RemoveFromMaps(const TemplateURL* template_url);
 
   // Removes the supplied template_url from the keyword maps. This searches
@@ skipping 154 matching lines @@
   // increasing integer that is initialized from the database.
   TemplateURLID next_id_;
 
   // List of extension IDs waiting for Load to have keywords registered.
   std::vector<std::string> pending_extension_ids_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLModel);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_MODEL_H_