diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 21:15:48 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 21:15:48 +0000 |
| commit | f762cacc6afb8ade2ba156914ca56385b0ebcd3d (patch) | |
| tree | d524eac89d204b21b748e100a55061cdc246c225 /components/webdata | |
| parent | eb4de0a2654a048adbc03fd281ae8ef33188f016 (diff) | |
| download | chromium_src-f762cacc6afb8ade2ba156914ca56385b0ebcd3d.zip chromium_src-f762cacc6afb8ade2ba156914ca56385b0ebcd3d.tar.gz chromium_src-f762cacc6afb8ade2ba156914ca56385b0ebcd3d.tar.bz2 | |
Reland "components/webdata: Break the dependency on chrome/test/base"
This was reverted because it broke android, because I forgot to remove
a line from build/android/pylib/gtest/test_runner.py
BUG=181277
TBR=joi@chromium.org
Review URL: https://chromiumcodereview.appspot.com/18201002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209348 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/webdata')
| -rw-r--r-- | components/webdata/DEPS | 4 | ||||
| -rw-r--r-- | components/webdata/common/web_database_migration_unittest.cc | 17 |
2 files changed, 11 insertions, 10 deletions
diff --git a/components/webdata/DEPS b/components/webdata/DEPS index d0c7e8f..1d575c8 100644 --- a/components/webdata/DEPS +++ b/components/webdata/DEPS @@ -1,5 +1,4 @@ include_rules = [ - "+components/encryptor", # WebData is used by iOS, which does not use content. "-content", "+sql", @@ -18,9 +17,6 @@ specific_include_rules = { "+chrome/browser/webdata/web_data_service.h", "+chrome/browser/webdata/web_data_service_factory.h", "+chrome/browser/webdata/web_intents_table.h", - "+chrome/test/base/ui_test_utils.h", "+content/public/test", - "+testing/gmock/include/gmock/gmock.h", - "+testing/gtest/include/gtest/gtest.h", ], } diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc index 739005d..fed5d5a 100644 --- a/components/webdata/common/web_database_migration_unittest.cc +++ b/components/webdata/common/web_database_migration_unittest.cc @@ -8,6 +8,7 @@ #include "base/files/scoped_temp_dir.h" #include "base/guid.h" #include "base/message_loop.h" +#include "base/path_service.h" #include "base/stl_util.h" #include "base/strings/string16.h" #include "base/strings/string_number_conversions.h" @@ -19,7 +20,6 @@ #include "chrome/browser/webdata/token_service_table.h" #include "chrome/browser/webdata/web_apps_table.h" #include "chrome/browser/webdata/web_intents_table.h" -#include "chrome/test/base/ui_test_utils.h" #include "components/autofill/core/browser/autofill_country.h" #include "components/autofill/core/browser/autofill_profile.h" #include "components/autofill/core/browser/autofill_type.h" @@ -207,13 +207,18 @@ class WebDatabaseMigrationTest : public testing::Test { } // The textual contents of |file| are read from - // "chrome/test/data/web_database" and returned in the string |contents|. + // "components/test/data/web_database" and returned in the string |contents|. // Returns true if the file exists and is read successfully, false otherwise. bool GetWebDatabaseData(const base::FilePath& file, std::string* contents) { - base::FilePath path = ui_test_utils::GetTestFilePath( - base::FilePath(FILE_PATH_LITERAL("web_database")), file); - return file_util::PathExists(path) && - file_util::ReadFileToString(path, contents); + base::FilePath source_path; + PathService::Get(base::DIR_SOURCE_ROOT, &source_path); + source_path = source_path.AppendASCII("components"); + source_path = source_path.AppendASCII("test"); + source_path = source_path.AppendASCII("data"); + source_path = source_path.AppendASCII("web_database"); + source_path = source_path.Append(file); + return file_util::PathExists(source_path) && + file_util::ReadFileToString(source_path, contents); } static int VersionFromConnection(sql::Connection* connection) { |