Only attempt once to autogenerate a keyword for search engines.

BUG=none
TEST=Add a search engine provider for which no keyword can be generated

Review URL: http://codereview.chromium.org/2008017

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47249 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 2 deletions

diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc
index 43dae52..d91bce9 100644
--- a/chrome/browser/search_engines/template_url.cc
+++ b/chrome/browser/search_engines/template_url.cc
@@ -569,10 +569,11 @@ void TemplateURL::set_keyword(const std::wstring& keyword) {
 }
 
 const std::wstring& TemplateURL::keyword() const {
-  if (autogenerate_keyword_ && keyword_.empty()) {
+  if (autogenerate_keyword_ && !keyword_generated_) {
     // Generate a keyword and cache it.
     keyword_ = TemplateURLModel::GenerateKeyword(
         TemplateURLModel::GenerateSearchURL(this).GetWithEmptyPath(), true);
+    keyword_generated_ = true;
   }
   return keyword_;
 }
@@ -615,6 +616,8 @@ GURL TemplateURL::GetFavIconURL() const {
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
-  if (autogenerate_keyword_)
+  if (autogenerate_keyword_) {
     keyword_.clear();
+    keyword_generated_ = false;
+  }
 }