Use whether a query is from the app list to determine the RLZ parameter.

chrome/browser/search_engines/template_url_unittest.cc

Index: chrome/browser/search_engines/template_url_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index 68b907b1cb7842e1971b6649d8bd0e5699215b54..e83dac6a6d5d1e5ce4ccfc6f62d8fb3d034ba916 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -681,6 +681,36 @@ TEST_F(TemplateURLTest, RLZ) {
   EXPECT_EQ(expected_url, result.spec());
 }
 
+TEST_F(TemplateURLTest, RLZFromAppList) {
+  base::string16 rlz_string;
+#if defined(ENABLE_RLZ)
+  std::string brand;
+  if (google_util::GetBrand(&brand) && !brand.empty() &&
+      !google_util::IsOrganic(brand)) {
+    RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_APP_LIST, &rlz_string);
+  }
+#elif defined(OS_ANDROID)

[Peter Kasting, 2014/04/08 20:33:14]

Is this test even useful on Android?

[Sam McNally, 2014/04/09 01:48:56]

Done.

+  SearchTermsDataAndroid::rlz_parameter_value_.Get() =
+      ASCIIToUTF16("android_test");
+  rlz_string = SearchTermsDataAndroid::rlz_parameter_value_.Get();
+#endif
+
+  TemplateURLData data;
+  data.SetURL("http://bar/?{google:RLZ}{searchTerms}");
+  TemplateURL url(NULL, data);
+  EXPECT_TRUE(url.url_ref().IsValid());
+  ASSERT_TRUE(url.url_ref().SupportsReplacement());
+  TemplateURLRef::SearchTermsArgs args(ASCIIToUTF16("x"));
+  args.from_app_list = true;
+  GURL result(url.url_ref().ReplaceSearchTerms(args));
+  ASSERT_TRUE(result.is_valid());
+  std::string expected_url = "http://bar/?";
+  if (!rlz_string.empty())
+    expected_url += "rlz=" + base::UTF16ToUTF8(rlz_string) + "&";
+  expected_url += "x";
+  EXPECT_EQ(expected_url, result.spec());
+}
+
 TEST_F(TemplateURLTest, HostAndSearchTermKey) {
   struct TestData {
     const std::string url;