summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 18:20:30 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-09 18:20:30 +0000
commitfb895c694e2117c29b6afb699095f6e187a44da7 (patch)
tree04a0d1434a470f55f0e639a3e6f15c18416d80e2 /net
parent8ecb6aa0a92d5426c2c98c23e0e3f3c4f06972c5 (diff)
downloadchromium_src-fb895c694e2117c29b6afb699095f6e187a44da7.zip
chromium_src-fb895c694e2117c29b6afb699095f6e187a44da7.tar.gz
chromium_src-fb895c694e2117c29b6afb699095f6e187a44da7.tar.bz2
Move more ICU-dependent stuff from base into base/i18n. Some test stuff also
depended on this, so to make the DEPS work out, I made a new base/test directory where I moved the testing-related files into a new directory base/test. TEST=none BUG=none Review URL: http://codereview.chromium.org/266038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/net_test_suite.h2
-rw-r--r--net/base/net_util.cc2
-rw-r--r--net/disk_cache/disk_cache_perftest.cc2
-rw-r--r--net/tools/tld_cleanup/tld_cleanup.cc2
4 files changed, 4 insertions, 4 deletions
diff --git a/net/base/net_test_suite.h b/net/base/net_test_suite.h
index 17e94c4..af58ca7 100644
--- a/net/base/net_test_suite.h
+++ b/net/base/net_test_suite.h
@@ -7,7 +7,7 @@
#include "base/message_loop.h"
#include "base/ref_counted.h"
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
#include "net/base/mock_host_resolver.h"
class NetTestSuite : public TestSuite {
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 8c36a5f..fc2fa84 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -42,7 +42,7 @@
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
#include "base/time.h"
-#include "base/time_format.h"
+#include "base/i18n/time_formatting.h"
#include "grit/net_resources.h"
#include "googleurl/src/gurl.h"
#include "googleurl/src/url_canon.h"
diff --git a/net/disk_cache/disk_cache_perftest.cc b/net/disk_cache/disk_cache_perftest.cc
index 34b69d7..4eab41d 100644
--- a/net/disk_cache/disk_cache_perftest.cc
+++ b/net/disk_cache/disk_cache_perftest.cc
@@ -9,7 +9,7 @@
#include "base/file_util.h"
#include "base/perftimer.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/timer.h"
#include "net/base/io_buffer.h"
#include "net/base/net_errors.h"
diff --git a/net/tools/tld_cleanup/tld_cleanup.cc b/net/tools/tld_cleanup/tld_cleanup.cc
index 6595842..d915c4d 100644
--- a/net/tools/tld_cleanup/tld_cleanup.cc
+++ b/net/tools/tld_cleanup/tld_cleanup.cc
@@ -21,7 +21,7 @@
#include "base/at_exit.h"
#include "base/file_util.h"
-#include "base/icu_util.h"
+#include "base/i18n/icu_util.h"
#include "base/logging.h"
#include "base/file_path.h"
#include "base/file_util.h"