Introduces a search term extraction mechanism working for arbitrary search providers.

chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc

 // 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.
 
 #include "base/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/scoped_temp_dir.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
@@ skipping 86 matching lines @@
   prefs->SetUserPref(prefs::kSearchProviderOverridesVersion,
                      Value::CreateIntegerValue(1));
   ListValue* overrides = new ListValue;
   DictionaryValue* entry = new DictionaryValue;
   entry->SetString("name", "foo");
   entry->SetString("keyword", "fook");
   entry->SetString("search_url", "http://foo.com/s?q={searchTerms}");
   entry->SetString("favicon_url", "http://foi.com/favicon.ico");
   entry->SetString("suggest_url", "");
   entry->SetString("instant_url", "");
+  entry->Set("alternate_urls", new ListValue());
   entry->SetString("encoding", "UTF-8");
   entry->SetInteger("id", 1001);
   overrides->Append(entry);
   prefs->SetUserPref(prefs::kSearchProviderOverrides, overrides);
 
   int version = TemplateURLPrepopulateData::GetDataVersion(prefs);
   EXPECT_EQ(1, version);
 
   ScopedVector<TemplateURL> t_urls;
   size_t default_index;
@@ skipping 86 matching lines @@
 
 TEST(TemplateURLPrepopulateDataTest, GetLogoURLInvalid) {
   TemplateURLData data;
   data.SetURL("http://invalid:search:url/");
   TemplateURL turl(NULL, data);
   GURL logo_url = TemplateURLPrepopulateData::GetLogoURL(
       turl, TemplateURLPrepopulateData::LOGO_100_PERCENT);
 
   EXPECT_TRUE(logo_url.is_empty());
 }