roll rlz 94:99
Also fix a few minor issues that the compiler complains about on mac, mostly
wstring/string16 confusion. All these changes are no-ops on windows.
95: Move SupplementaryBranding from win/lib/rlz_lib.h to lib/rlz_lib.h
96: Move ClearAllProductEvents() to use RlzValueStore.
97: Move ClearAllProductEvents() to shared code. Pure code move.
98: Move ClearProductState() to RlzValueStore.
99: Move ClearProductState() to common code.
BUG=46579
TEST=none
TBR=rogerta
Review URL: http://codereview.chromium.org/9717012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127322 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc
index a9f1307a..c800433f 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/chrome/browser/search_engines/template_url_unittest.cc
@@ -420,12 +420,12 @@
TemplateURLRef ref("http://bar/?{google:RLZ}{searchTerms}", 1, 2);
ASSERT_TRUE(ref.IsValid());
ASSERT_TRUE(ref.SupportsReplacement());
- GURL result(ref.ReplaceSearchTerms(t_url, L"x",
+ GURL result(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("x"),
TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
ASSERT_TRUE(result.is_valid());
std::string expected_url = "http://bar/?";
if (!rlz_string.empty())
- expected_url += "rlz=" + WideToUTF8(rlz_string) + "&";
+ expected_url += "rlz=" + UTF16ToUTF8(rlz_string) + "&";
expected_url += "x";
EXPECT_EQ(expected_url, result.spec());
}
