summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 01:25:14 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-01 01:25:14 +0000
commit29a596b68aa20e3017985d1dc5cbbdceeef6017c (patch)
tree7b980032b848efd82ac8cfb1c7f1b5f058913aed /chrome
parent0acf16322e4c38f2c4153ef0dee2b2772597d42b (diff)
downloadchromium_src-29a596b68aa20e3017985d1dc5cbbdceeef6017c.zip
chromium_src-29a596b68aa20e3017985d1dc5cbbdceeef6017c.tar.gz
chromium_src-29a596b68aa20e3017985d1dc5cbbdceeef6017c.tar.bz2
Undisable the temporarily disabled test, by fixing the URL expectation to have %22 instead of \" (to match change in GURL canonicalization).
BUG=11142 TBR=evan Review URL: http://codereview.chromium.org/100148 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15027 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/importer/importer_unittest.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/browser/importer/importer_unittest.cc b/chrome/browser/importer/importer_unittest.cc
index aad4702..01b75cd 100644
--- a/chrome/browser/importer/importer_unittest.cc
+++ b/chrome/browser/importer/importer_unittest.cc
@@ -423,7 +423,7 @@ static const BookmarkList kFirefox2Bookmarks[] = {
"http://domain/"},
{false, 0, {},
L"<Name>",
- "http://domain.com/q?a=\"er\"&b=%3C%20%20%3E"},
+ "http://domain.com/q?a=%22er%22&b=%3C%20%20%3E"},
{false, 0, {},
L"Google Home Page",
"http://www.google.com/"},
@@ -598,8 +598,7 @@ class FirefoxObserver : public ProfileWriter,
std::wstring default_keyword_url_;
};
-// http://crbug.com/11142
-TEST_F(ImporterTest, DISABLED_Firefox2Importer) {
+TEST_F(ImporterTest, Firefox2Importer) {
std::wstring data_path;
ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &data_path));
file_util::AppendToPath(&data_path, L"firefox2_profile\\*");