Fix for google:instantExtendedEnabledKey replacement

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index eb1998a24b0cdf47f116e2c476a62fbf4ab35963..d87461ee62cb6ee22e8df78cc307668165750ede 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -68,6 +68,8 @@ const char kDefaultCount[] = "10";
 const char kOutputEncodingType[] = "UTF-8";
 
 constexpr char kGoogleInstantExtendedEnabledKey[] =
+    "google:instantExtendedEnabledKey";
+constexpr char kGoogleInstantExtendedEnabledKeyFull[] =
     "{google:instantExtendedEnabledKey}";
 
 // Attempts to encode |terms| and |original_query| in |encoding| and escape
@@ -171,10 +173,10 @@ bool SearchTermsReplacementKeysMatch(
   if (search_terms_replacement_key1 == search_terms_replacement_key2)
     return true;
   if (search_terms_replacement_key1 == google_util::kInstantExtendedAPIParam &&
-      search_terms_replacement_key2 == kGoogleInstantExtendedEnabledKey)
+      search_terms_replacement_key2 == kGoogleInstantExtendedEnabledKeyFull)
     return true;
   if (search_terms_replacement_key2 == google_util::kInstantExtendedAPIParam &&
-      search_terms_replacement_key1 == kGoogleInstantExtendedEnabledKey)
+      search_terms_replacement_key1 == kGoogleInstantExtendedEnabledKeyFull)
     return true;
   return false;
 }
@@ -1211,7 +1213,8 @@ TemplateURL::TemplateURL(const TemplateURLData& data, Type type)
   ResizeURLRefVector();
   SetPrepopulateId(data_.prepopulate_id);
 
-  if (data_.search_terms_replacement_key == kGoogleInstantExtendedEnabledKey)
+  if (data_.search_terms_replacement_key ==
+      kGoogleInstantExtendedEnabledKeyFull)
     data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam;
 }