diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 15:30:00 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 15:30:00 +0000 |
| commit | 46991c59023c40e5e4b82e575ff83c4b3b8f2a34 (patch) | |
| tree | f1265b6b4f3da6bd391f25d567b47974bc9f9c3b /chrome | |
| parent | b2d27cbb0926a997759115f73f221e1f3bb56755 (diff) | |
| download | chromium_src-46991c59023c40e5e4b82e575ff83c4b3b8f2a34.zip chromium_src-46991c59023c40e5e4b82e575ff83c4b3b8f2a34.tar.gz chromium_src-46991c59023c40e5e4b82e575ff83c4b3b8f2a34.tar.bz2 | |
Revert change 8081 because it breaks the unit tests
Review URL: http://codereview.chromium.org/18274
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/template_url_unittest.cc | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/chrome/browser/template_url_unittest.cc b/chrome/browser/template_url_unittest.cc index 67875af..d5d745f 100644 --- a/chrome/browser/template_url_unittest.cc +++ b/chrome/browser/template_url_unittest.cc @@ -2,7 +2,6 @@ // 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" @@ -304,20 +303,18 @@ TEST_F(TemplateURLTest, Suggestions) { } TEST_F(TemplateURLTest, RLZ) { - if (!RLZTracker::InitRlz(base::DIR_EXE)) - return; std::wstring rlz_string; - ASSERT_TRUE(RLZTracker::GetAccessPointRlz(RLZTracker::CHROME_OMNIBOX, - &rlz_string)); + 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()); - ASSERT_EQ("http://bar/?rlz=" + WideToUTF8(rlz_string) + "&x", result.spec()); + // TODO(levin): fix this! + // ASSERT_EQ("http://bar/" + WideToUTF8(rlz_string) + "x", result.spec()); } TEST_F(TemplateURLTest, HostAndSearchTermKey) { |