diff options
| author | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 06:03:21 +0000 |
|---|---|---|
| committer | levin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 06:03:21 +0000 |
| commit | 92352a66515fd9a01f538529356ad45870109f28 (patch) | |
| tree | ae906b58ad7a8f178d21727d4a0f829f6e03a66d /chrome/browser | |
| parent | dc4ee74f8f1826ce1b4c50af342588cf33f3007e (diff) | |
| download | chromium_src-92352a66515fd9a01f538529356ad45870109f28.zip chromium_src-92352a66515fd9a01f538529356ad45870109f28.tar.gz chromium_src-92352a66515fd9a01f538529356ad45870109f28.tar.bz2 | |
This test only passed if RLZTracker::InitRlz hadn't been called,
so it failed when the test run order happened to change.
This change fixes that.
Review URL: http://codereview.chromium.org/18222
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8081 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/template_url_unittest.cc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/chrome/browser/template_url_unittest.cc b/chrome/browser/template_url_unittest.cc index d5d745f..67875af 100644 --- a/chrome/browser/template_url_unittest.cc +++ b/chrome/browser/template_url_unittest.cc @@ -2,6 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/base_paths.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/rlz/rlz.h" @@ -303,18 +304,20 @@ TEST_F(TemplateURLTest, Suggestions) { } TEST_F(TemplateURLTest, RLZ) { + if (!RLZTracker::InitRlz(base::DIR_EXE)) + return; std::wstring rlz_string; - RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, &rlz_string); + ASSERT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, + &rlz_string)); TemplateURL t_url; - TemplateURLRef ref(L"http://bar/{google:RLZ}{searchTerms}", 1, 2); + TemplateURLRef ref(L"http://bar/?{google:RLZ}{searchTerms}", 1, 2); ASSERT_TRUE(ref.IsValid()); ASSERT_TRUE(ref.SupportsReplacement()); GURL result = ref.ReplaceSearchTerms(t_url, L"x", TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, std::wstring()); ASSERT_TRUE(result.is_valid()); - // TODO(levin): fix this! - // ASSERT_EQ("http://bar/" + WideToUTF8(rlz_string) + "x", result.spec()); + ASSERT_EQ("http://bar/?rlz=" + WideToUTF8(rlz_string) + "&x", result.spec()); } TEST_F(TemplateURLTest, HostAndSearchTermKey) { |