diff options
| author | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 06:27:31 +0000 |
|---|---|---|
| committer | tim@chromium.org <tim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 06:27:31 +0000 |
| commit | df0d77c4e4e476d43ae65f29d9d4638664e79677 (patch) | |
| tree | adc5814fbbf8bb07c36b72d1dabab4c81eeb0910 /components/url_fixer | |
| parent | b17aad0450e9fe7f7e9336ca3da058edb05213c2 (diff) | |
| download | chromium_src-df0d77c4e4e476d43ae65f29d9d4638664e79677.zip chromium_src-df0d77c4e4e476d43ae65f29d9d4638664e79677.tar.gz chromium_src-df0d77c4e4e476d43ae65f29d9d4638664e79677.tar.bz2 | |
Revert of android tests: don't override DIR_MODULE (https://codereview.chromium.org/408063002/)
Reason for revert:
Need to fix components_unittests on iOS simulator (try was green, but test actually failed)
Original issue's description:
> android tests: don't override DIR_MODULE
>
> BUG=
> R=brettw@chromium.org, nyquist@chromium.org, phajdan.jr@chromium.org, sky@chromium.org
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=285096
TBR=nyquist@chromium.org,brettw@chromium.org,sky@chromium.org,phajdan.jr@chromium.org,jamesr@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=
Review URL: https://codereview.chromium.org/417943002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285157 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/url_fixer')
| -rw-r--r-- | components/url_fixer/url_fixer_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/url_fixer/url_fixer_unittest.cc b/components/url_fixer/url_fixer_unittest.cc index 727b813..fa4e03c 100644 --- a/components/url_fixer/url_fixer_unittest.cc +++ b/components/url_fixer/url_fixer_unittest.cc @@ -354,7 +354,7 @@ TEST(URLFixerTest, FixupFile) { // this "original" filename is the one we tweak to get all the variations base::FilePath dir; base::FilePath original; - ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &dir)); + ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &dir)); ASSERT_TRUE(MakeTempFile( dir, base::FilePath(FILE_PATH_LITERAL("url fixer upper existing file.txt")), @@ -438,7 +438,7 @@ TEST(URLFixerTest, FixupRelativeFile) { base::FilePath full_path, dir; base::FilePath file_part( FILE_PATH_LITERAL("url_fixer_upper_existing_file.txt")); - ASSERT_TRUE(PathService::Get(base::DIR_TEST_DATA, &dir)); + ASSERT_TRUE(PathService::Get(base::DIR_MODULE, &dir)); ASSERT_TRUE(MakeTempFile(dir, file_part, &full_path)); full_path = base::MakeAbsoluteFilePath(full_path); ASSERT_FALSE(full_path.empty()); |