| 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 656e7b87ceb654aaf806619305028d3db7a506f8..2c4c5645552ddc339b16f807c9a8d62485ef05c1 100644 | 
| --- a/chrome/browser/search_engines/template_url_unittest.cc | 
| +++ b/chrome/browser/search_engines/template_url_unittest.cc | 
| @@ -411,7 +411,8 @@ TEST_F(TemplateURLTest, Suggestions) { | 
| } | 
| } | 
|  | 
| -#if defined(OS_WIN) || defined(OS_MACOSX) | 
| +// If an RLZ exists, test injection of the rlz generator.  Else test rlz | 
| +// injection using the StaticRlz flow. | 
| TEST_F(TemplateURLTest, RLZ) { | 
| string16 rlz_string; | 
| #if defined(ENABLE_RLZ) | 
| @@ -421,6 +422,10 @@ TEST_F(TemplateURLTest, RLZ) { | 
| RLZTracker::GetAccessPointRlz(rlz_lib::CHROME_OMNIBOX, &rlz_string); | 
| } | 
| #endif | 
| +  if (rlz_string.empty()) { | 
| +    rlz_string = ASCIIToUTF16("foo"); | 
| +    UIThreadSearchTermsData::SetStaticRlz(rlz_string); | 
| +  } | 
|  | 
| TemplateURLData data; | 
| data.SetURL("http://bar/?{google:RLZ}{searchTerms}"); | 
| @@ -431,12 +436,10 @@ TEST_F(TemplateURLTest, RLZ) { | 
| TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16())); | 
| ASSERT_TRUE(result.is_valid()); | 
| std::string expected_url = "http://bar/?"; | 
| -  if (!rlz_string.empty()) | 
| -    expected_url += "rlz=" + UTF16ToUTF8(rlz_string) + "&"; | 
| +  expected_url += "rlz=" + UTF16ToUTF8(rlz_string) + "&"; | 
| expected_url += "x"; | 
| EXPECT_EQ(expected_url, result.spec()); | 
| } | 
| -#endif | 
|  | 
| TEST_F(TemplateURLTest, HostAndSearchTermKey) { | 
| struct TestData { | 
|  |