diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:29:56 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-25 23:29:56 +0000 |
| commit | e14b157092a8f865de46dbbeb702af29fa9f0142 (patch) | |
| tree | 9c5dc3276d09c81b1145fb40ee525e3a5013ad9b /chrome | |
| parent | 42eb6b07c2791d8d13ec48ea3c92725eee4d94a2 (diff) | |
| download | chromium_src-e14b157092a8f865de46dbbeb702af29fa9f0142.zip chromium_src-e14b157092a8f865de46dbbeb702af29fa9f0142.tar.gz chromium_src-e14b157092a8f865de46dbbeb702af29fa9f0142.tar.bz2 | |
Fix up paths now that test_file_util has moved.
Review URL: http://codereview.chromium.org/12453
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6008 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/SConscript | 5 | ||||
| -rw-r--r-- | chrome/browser/safe_browsing/database_perftest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/visitedlink_perftest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/ui/ui_test.cc | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 8ef589e..8d07343 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -374,11 +374,6 @@ if env_flat['PLATFORM'] == 'win32': # determines implicit dependencies from .rc files. env_flat.Depends(browser_res, flats_out) - -# TODO(port) - env_test.Object('test/test_file_util.cc', - CPPPATH=['..'] + env['CPPPATH']) - sconscript_files = [] if not env.WantSystemLib('hunspell'): diff --git a/chrome/browser/safe_browsing/database_perftest.cc b/chrome/browser/safe_browsing/database_perftest.cc index 167e16f..c39a58d 100644 --- a/chrome/browser/safe_browsing/database_perftest.cc +++ b/chrome/browser/safe_browsing/database_perftest.cc @@ -12,11 +12,11 @@ #include "base/path_service.h" #include "base/perftimer.h" #include "base/string_util.h" +#include "base/test_file_util.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/sqlite_compiled_statement.h" #include "chrome/common/sqlite_utils.h" -#include "chrome/test/test_file_util.h" #include "testing/gtest/include/gtest/gtest.h" // These tests are slow, especially the ones that create databases. So disable diff --git a/chrome/browser/visitedlink_perftest.cc b/chrome/browser/visitedlink_perftest.cc index 38fe56d..328e9fe 100644 --- a/chrome/browser/visitedlink_perftest.cc +++ b/chrome/browser/visitedlink_perftest.cc @@ -10,8 +10,8 @@ #include "base/perftimer.h" #include "base/shared_memory.h" #include "base/string_util.h" +#include "base/test_file_util.h" #include "chrome/browser/visitedlink_master.h" -#include "chrome/test/test_file_util.h" #include "testing/gtest/include/gtest/gtest.h" using base::TimeDelta; diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc index 72d2f57..319be79 100644 --- a/chrome/test/ui/ui_test.cc +++ b/chrome/test/ui/ui_test.cc @@ -13,6 +13,7 @@ #include "base/process_util.h" #include "base/scoped_ptr.h" #include "base/string_util.h" +#include "base/test_file_util.h" #include "base/time.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/url_fixer_upper.h" @@ -26,7 +27,6 @@ #include "chrome/test/automation/browser_proxy.h" #include "chrome/test/automation/tab_proxy.h" #include "chrome/test/automation/window_proxy.h" -#include "chrome/test/test_file_util.h" #include "googleurl/src/gurl.h" #include "net/base/net_util.h" |