Moving prepopulated search engines to a JSON file.

chrome/browser/search_engines/prepopulated_engines.json

Index: chrome/browser/search_engines/prepopulated_engines.json
diff --git a/chrome/browser/search_engines/prepopulated_engines.json b/chrome/browser/search_engines/prepopulated_engines.json
new file mode 100644
index 0000000000000000000000000000000000000000..f4c389196b8cf9ee6c0c28623d1c3c3876be249a
--- /dev/null
+++ b/chrome/browser/search_engines/prepopulated_engines.json
@@ -0,0 +1,58 @@
+// Copyright (c) 2012 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.
+
+// This file is used by json_to_struct.py to generate prepopulated_engine.h/cc.
+
+// Engine definitions. See prepopulated_engines_schema.json for the field
+// definitions.
+
+// The following unique IDs are available:
+//    53, 56, 58, 60, 61, 64, 65, 66, 70, 74, 78, 79, 80, 81, 84, 86, 88, 91,
+//    92, 93, 94, 95, 96, 97, 98, 99, 102+
+//
+// IDs > 1000 are reserved for distribution custom engines.
+//
+// NOTES:
+//   CHANGE THE ABOVE NUMBERS IF YOU ADD A NEW ENGINE; ID conflicts = bad!
+//   CHANGE kMaxPrepopulatedEngineID in template_url_prepopulate_data.cc if you
+//       add new engine outside of the current range or it will not be counted
+//       in stats.
+
+{
+  // Increment this if you change the above data in ways that mean users with

[Peter Kasting, 2012/11/09 22:07:23]

Nit: This comment shouldn't say "above data"

[beaudoin, 2012/11/10 09:17:54]

Done.

+  // existing data should get a new version.
+  "version": 45,
+
+  "engines": {
+    "abcsok": {
+      "name": "ABC S\u00f8k",
+      "keyword": "abcsok.no",
+      "favicon_url": "http://abcsok.no/favicon.ico",
+      "search_url": "http://abcsok.no/index.html?q={searchTerms}",
+      "type": "SEARCH_ENGINE_ABCSOK",
+      "id": 72
+    },
+
+    "altavista": {
+      "name": "AltaVista",
+      "keyword": "altavista.com",
+      "favicon_url": "http://www.altavista.com/favicon.ico",
+      "search_url": "http://www.altavista.com/web/results?q={searchTerms}",
+      "type": "SEARCH_ENGINE_ALTAVISTA",
+      "id": 89
+    },
+
+    "google": {
+      "name": "Google",
+      "keyword": "google.com",
+      "favicon_url": "http://www.google.com/favicon.ico",
+      "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ} {google:acceptedSuggestion}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}sourceid=chrome&ie={inputEncoding}",

[Peter Kasting, 2012/11/09 22:07:23]

The space here is erroneous

[beaudoin, 2012/11/10 09:17:54]

Done.

+      "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client=chrome&hl={language}&q={searchTerms}&sugkey={google:suggestAPIKeyParameter}",
+      "instant_url": "{google:baseURL}webhp?sourceid=chrome-instant&{google:RLZ}{google:instantEnabledParameter}ie={inputEncoding}",
+      "alternate_urls": "[\"{google:baseURL}#q={searchTerms}\", \"{google:baseURL}search#q={searchTerms}\", \"{google:baseURL}webhp#q={searchTerms}\"]",

[Peter Kasting, 2012/11/09 22:07:23]

Having to escape the quotes here sucks, can we avoid that somehow?

[beaudoin, 2012/11/10 09:17:54]

Yes. It's actually one benefit of that approach: The "alternate_urls" is now a
static C array so we don't have nested JSON and the JSON parsing is all done
before run-time.

Done.

+      "type": "SEARCH_ENGINE_GOOGLE",
+      "id": 1
+    }
+  }
+}