Revert of 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 d87461ee62cb6ee22e8df78cc307668165750ede..eb1998a24b0cdf47f116e2c476a62fbf4ab35963 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -68,8 +68,6 @@
 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
@@ -173,10 +171,10 @@
   if (search_terms_replacement_key1 == search_terms_replacement_key2)
     return true;
   if (search_terms_replacement_key1 == google_util::kInstantExtendedAPIParam &&
-      search_terms_replacement_key2 == kGoogleInstantExtendedEnabledKeyFull)
+      search_terms_replacement_key2 == kGoogleInstantExtendedEnabledKey)
     return true;
   if (search_terms_replacement_key2 == google_util::kInstantExtendedAPIParam &&
-      search_terms_replacement_key1 == kGoogleInstantExtendedEnabledKeyFull)
+      search_terms_replacement_key1 == kGoogleInstantExtendedEnabledKey)
     return true;
   return false;
 }
@@ -1213,8 +1211,7 @@
   ResizeURLRefVector();
   SetPrepopulateId(data_.prepopulate_id);
 
-  if (data_.search_terms_replacement_key ==
-      kGoogleInstantExtendedEnabledKeyFull)
+  if (data_.search_terms_replacement_key == kGoogleInstantExtendedEnabledKey)
     data_.search_terms_replacement_key = google_util::kInstantExtendedAPIParam;
 }