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
diff --git a/app/test_suite.h b/app/test_suite.h
index 8cb6ee1..038d4a7 100644
--- a/app/test_suite.h
+++ b/app/test_suite.h
@@ -16,7 +16,7 @@
#include "base/mac_util.h"
#endif
#include "base/scoped_nsautorelease_pool.h"
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
class AppTestSuite : public TestSuite {
public:
diff --git a/base/DEPS b/base/DEPS
index 99afd19..3fdcb7b 100644
--- a/base/DEPS
+++ b/base/DEPS
@@ -1,6 +1,7 @@
include_rules = [
- "+third_party/zlib",
"+third_party/libevent",
- "+third_party/libjpeg",
"+third_party/dmg_fp",
+
+ # Testing stuff shouldn't be used by the general base code.
+ "-base/test",
]
diff --git a/base/base.gyp b/base/base.gyp
index 570e9f0..09dca2b 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -144,12 +144,16 @@
'i18n/file_util_icu.h',
'i18n/icu_string_conversions.cc',
'i18n/icu_string_conversions.h',
+ 'i18n/icu_util.cc',
+ 'i18n/icu_util.h',
'i18n/number_formatting.cc',
'i18n/number_formatting.h',
+ 'i18n/time_formatting.cc',
+ 'i18n/time_formatting.h',
+ 'i18n/word_iterator.cc',
+ 'i18n/word_iterator.h',
'iat_patch.cc',
'iat_patch.h',
- 'icu_util.cc',
- 'icu_util.h',
'id_map.h',
'image_util.cc',
'image_util.h',
@@ -314,8 +318,6 @@
'thread_local_win.cc',
'time.cc',
'time.h',
- 'time_format.cc',
- 'time_format.h',
'time_mac.cc',
'time_posix.cc',
'time_win.cc',
@@ -349,8 +351,6 @@
'windows_message_list.h',
'wmi_util.cc',
'wmi_util.h',
- 'word_iterator.cc',
- 'word_iterator.h',
'worker_pool.h',
'worker_pool_linux.cc',
'worker_pool_linux.h',
@@ -560,8 +560,8 @@
'sources': [
# Infrastructure files.
'multiprocess_test.h',
- 'run_all_unittests.cc',
- 'test_suite.h',
+ 'test/run_all_unittests.cc',
+ 'test/test_suite.h',
# Tests.
'at_exit_unittest.cc',
@@ -585,6 +585,7 @@
'hmac_unittest.cc',
'id_map_unittest.cc',
'i18n/file_util_icu_unittest.cc',
+ 'i18n/word_iterator_unittest.cc',
'json_reader_unittest.cc',
'json_writer_unittest.cc',
'lazy_instance_unittest.cc',
@@ -639,7 +640,6 @@
'weak_ptr_unittest.cc',
'win_util_unittest.cc',
'wmi_util_unittest.cc',
- 'word_iterator_unittest.cc',
'worker_pool_unittest.cc',
],
'include_dirs': [
@@ -707,11 +707,11 @@
'base',
],
'sources': [
- 'test_file_util.h',
- 'test_file_util_linux.cc',
- 'test_file_util_mac.cc',
- 'test_file_util_posix.cc',
- 'test_file_util_win.cc',
+ 'test/test_file_util.h',
+ 'test/test_file_util_linux.cc',
+ 'test/test_file_util_mac.cc',
+ 'test/test_file_util_posix.cc',
+ 'test/test_file_util_win.cc',
],
'conditions': [
[ 'OS == "linux" or OS == "freebsd"', {
@@ -745,7 +745,7 @@
],
'sources': [
'perftimer.cc',
- 'run_all_perftests.cc',
+ 'test/run_all_perftests.cc',
],
'direct_dependent_settings': {
'defines': [
@@ -756,8 +756,8 @@
['OS == "linux" or OS == "freebsd"', {
'dependencies': [
# Needed to handle the #include chain:
- # base/perf_test_suite.h
- # base/test_suite.h
+ # base/test/perf_test_suite.h
+ # base/test/test_suite.h
# gtk/gtk.h
'../build/linux/system.gyp:gtk',
],
diff --git a/base/icu_util.cc b/base/i18n/icu_util.cc
similarity index 96%
rename from base/icu_util.cc
rename to base/i18n/icu_util.cc
index b885cd1..6239a01 100644
--- a/base/icu_util.cc
+++ b/base/i18n/icu_util.cc
@@ -1,7 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/i18n/icu_util.h"
+
#include "build/build_config.h"
#if defined(OS_WIN)
@@ -10,8 +12,6 @@
#include <string>
-#include "base/icu_util.h"
-
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/logging.h"
diff --git a/base/icu_util.h b/base/i18n/icu_util.h
similarity index 65%
rename from base/icu_util.h
rename to base/i18n/icu_util.h
index 5829b70d..56eaa37 100644
--- a/base/icu_util.h
+++ b/base/i18n/icu_util.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_ICU_UTIL_H__
-#define BASE_ICU_UTIL_H__
+#ifndef BASE_I18N_ICU_UTIL_H_
+#define BASE_I18N_ICU_UTIL_H_
namespace icu_util {
@@ -13,4 +13,4 @@
} // namespace icu_util
-#endif // BASE_ICU_UTIL_H__
+#endif // BASE_I18N_ICU_UTIL_H_
diff --git a/base/time_format.cc b/base/i18n/time_formatting.cc
similarity index 94%
rename from base/time_format.cc
rename to base/i18n/time_formatting.cc
index 80c4235..f031cf7 100644
--- a/base/time_format.cc
+++ b/base/i18n/time_formatting.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/time_format.h"
+#include "base/i18n/time_formatting.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
diff --git a/base/time_format.h b/base/i18n/time_formatting.h
similarity index 84%
rename from base/time_format.h
rename to base/i18n/time_formatting.h
index b51c768..dd623af 100644
--- a/base/time_format.h
+++ b/base/i18n/time_formatting.h
@@ -1,12 +1,12 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
// Basic time formatting methods. These methods use the current locale
// formatting for displaying the time.
-#ifndef BASE_TIME_FORMAT_H_
-#define BASE_TIME_FORMAT_H_
+#ifndef BASE_I18N_TIME_FORMATTING_H_
+#define BASE_I18N_TIME_FORMATTING_H_
#include <string>
@@ -37,4 +37,4 @@
} // namespace base
-#endif // BASE_TIME_FORMAT_H_
+#endif // BASE_I18N_TIME_FORMATTING_H_
diff --git a/base/word_iterator.cc b/base/i18n/word_iterator.cc
similarity index 95%
rename from base/word_iterator.cc
rename to base/i18n/word_iterator.cc
index edbc4d3..45a06b99 100644
--- a/base/word_iterator.cc
+++ b/base/i18n/word_iterator.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/word_iterator.h"
+#include "base/i18n/word_iterator.h"
#include "base/logging.h"
#include "unicode/ubrk.h"
diff --git a/base/word_iterator.h b/base/i18n/word_iterator.h
similarity index 91%
rename from base/word_iterator.h
rename to base/i18n/word_iterator.h
index 3e53c201..c9648ca 100644
--- a/base/word_iterator.h
+++ b/base/i18n/word_iterator.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef BASE_WORD_ITERATOR_H__
-#define BASE_WORD_ITERATOR_H__
+#ifndef BASE_I18N_WORD_ITERATOR_H_
+#define BASE_I18N_WORD_ITERATOR_H_
#include <string>
#include <vector>
@@ -81,7 +81,7 @@
// Previous and current iterator positions.
size_t prev_, pos_;
- DISALLOW_EVIL_CONSTRUCTORS(WordIterator);
+ DISALLOW_COPY_AND_ASSIGN(WordIterator);
};
-#endif // BASE_WORD_ITERATOR_H__
+#endif // BASE_I18N_WORD_ITERATOR_H__
diff --git a/base/word_iterator_unittest.cc b/base/i18n/word_iterator_unittest.cc
similarity index 95%
rename from base/word_iterator_unittest.cc
rename to base/i18n/word_iterator_unittest.cc
index 4f85a46..0d28370 100644
--- a/base/word_iterator_unittest.cc
+++ b/base/i18n/word_iterator_unittest.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/word_iterator.h"
+#include "base/i18n/word_iterator.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/base/perf_test_suite.h b/base/test/perf_test_suite.h
similarity index 93%
rename from base/perf_test_suite.h
rename to base/test/perf_test_suite.h
index ea6846a..7393544 100644
--- a/base/perf_test_suite.h
+++ b/base/test/perf_test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -11,7 +11,7 @@
#include "base/perftimer.h"
#include "base/process_util.h"
#include "base/string_util.h"
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
class PerfTestSuite : public TestSuite {
public:
diff --git a/base/run_all_perftests.cc b/base/test/run_all_perftests.cc
similarity index 86%
rename from base/run_all_perftests.cc
rename to base/test/run_all_perftests.cc
index 84ed48fd..6d0a8ee 100644
--- a/base/run_all_perftests.cc
+++ b/base/test/run_all_perftests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/perf_test_suite.h"
+#include "base/test/perf_test_suite.h"
int main(int argc, char** argv) {
return PerfTestSuite(argc, argv).Run();
diff --git a/base/run_all_unittests.cc b/base/test/run_all_unittests.cc
similarity index 64%
rename from base/run_all_unittests.cc
rename to base/test/run_all_unittests.cc
index d9f6b58..841b3532 100644
--- a/base/run_all_unittests.cc
+++ b/base/test/run_all_unittests.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
int main(int argc, char** argv) {
return TestSuite(argc, argv).Run();
diff --git a/base/test_file_util.h b/base/test/test_file_util.h
similarity index 100%
rename from base/test_file_util.h
rename to base/test/test_file_util.h
diff --git a/base/test_file_util_linux.cc b/base/test/test_file_util_linux.cc
similarity index 93%
rename from base/test_file_util_linux.cc
rename to base/test/test_file_util_linux.cc
index c1b3768..c2911ce 100644
--- a/base/test_file_util_linux.cc
+++ b/base/test/test_file_util_linux.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include <fcntl.h>
#include <sys/stat.h>
diff --git a/base/test_file_util_mac.cc b/base/test/test_file_util_mac.cc
similarity index 95%
rename from base/test_file_util_mac.cc
rename to base/test/test_file_util_mac.cc
index 05e57c4..316b5c3d 100644
--- a/base/test_file_util_mac.cc
+++ b/base/test/test_file_util_mac.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include <sys/mman.h>
#include <errno.h>
@@ -22,14 +22,14 @@
DLOG(WARNING) << "failed to memory map " << file.value();
return false;
}
-
+
if (msync(const_cast<uint8*>(mapped_file.data()), mapped_file.length(),
MS_INVALIDATE) != 0) {
- DLOG(WARNING) << "failed to invalidate memory map of " << file.value()
+ DLOG(WARNING) << "failed to invalidate memory map of " << file.value()
<< ", errno: " << errno;
return false;
}
-
+
return true;
}
diff --git a/base/test_file_util_posix.cc b/base/test/test_file_util_posix.cc
similarity index 98%
rename from base/test_file_util_posix.cc
rename to base/test/test_file_util_posix.cc
index 122dd04..096f3c65 100644
--- a/base/test_file_util_posix.cc
+++ b/base/test/test_file_util_posix.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include <errno.h>
#include <sys/types.h>
diff --git a/base/test_file_util_win.cc b/base/test/test_file_util_win.cc
similarity index 99%
rename from base/test_file_util_win.cc
rename to base/test/test_file_util_win.cc
index 600f30a5..4ebea54 100644
--- a/base/test_file_util_win.cc
+++ b/base/test/test_file_util_win.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include <windows.h>
diff --git a/base/test_suite.h b/base/test/test_suite.h
similarity index 98%
rename from base/test_suite.h
rename to base/test/test_suite.h
index 4102252..1203904 100644
--- a/base/test_suite.h
+++ b/base/test/test_suite.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -15,7 +15,7 @@
#include "base/debug_on_start.h"
#include "base/debug_util.h"
#include "base/file_path.h"
-#include "base/icu_util.h"
+#include "base/i18n/icu_util.h"
#include "base/logging.h"
#include "base/multiprocess_test.h"
#include "base/scoped_nsautorelease_pool.h"
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 62d5b5ac..756fa96 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -38,7 +38,7 @@
#if defined(OS_POSIX)
#include "base/global_descriptors_posix.h"
#endif
-#include "base/icu_util.h"
+#include "base/i18n/icu_util.h"
#include "base/message_loop.h"
#include "base/path_service.h"
#include "base/process_util.h"
diff --git a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
index ead21c0..49cf699 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_html_writer_unittest.cc
@@ -8,7 +8,7 @@
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "base/time_format.h"
+#include "base/i18n/time_formatting.h"
#include "chrome/browser/bookmarks/bookmark_html_writer.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/importer/firefox2_importer.h"
diff --git a/chrome/browser/bookmarks/bookmark_table_model.cc b/chrome/browser/bookmarks/bookmark_table_model.cc
index 052497b..142090c 100644
--- a/chrome/browser/bookmarks/bookmark_table_model.cc
+++ b/chrome/browser/bookmarks/bookmark_table_model.cc
@@ -9,8 +9,8 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
#include "app/table_model_observer.h"
+#include "base/i18n/time_formatting.h"
#include "base/string_util.h"
-#include "base/time_format.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/bookmarks/bookmark_utils.h"
#include "chrome/browser/profile.h"
diff --git a/chrome/browser/cocoa/page_info_window_mac.mm b/chrome/browser/cocoa/page_info_window_mac.mm
index a31f0b95..b7dfff7 100644
--- a/chrome/browser/cocoa/page_info_window_mac.mm
+++ b/chrome/browser/cocoa/page_info_window_mac.mm
@@ -8,8 +8,8 @@
#include <SecurityInterface/SFCertificatePanel.h>
#include "app/l10n_util.h"
+#include "base/i18n/time_formatting.h"
#include "base/string_util.h"
-#include "base/time_format.h"
#include "base/sys_string_conversions.h"
#import "chrome/browser/cocoa/page_info_window_controller.h"
#include "chrome/browser/cert_store.h"
diff --git a/chrome/browser/dom_ui/downloads_dom_handler.cc b/chrome/browser/dom_ui/downloads_dom_handler.cc
index e13163f3..33ea691e 100644
--- a/chrome/browser/dom_ui/downloads_dom_handler.cc
+++ b/chrome/browser/dom_ui/downloads_dom_handler.cc
@@ -6,9 +6,9 @@
#include "app/l10n_util.h"
#include "base/basictypes.h"
+#include "base/i18n/time_formatting.h"
#include "base/string_piece.h"
#include "base/thread.h"
-#include "base/time_format.h"
#include "base/values.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/dom_ui/chrome_url_data_manager.h"
diff --git a/chrome/browser/dom_ui/history_ui.cc b/chrome/browser/dom_ui/history_ui.cc
index 978ad074..17e6580c 100644
--- a/chrome/browser/dom_ui/history_ui.cc
+++ b/chrome/browser/dom_ui/history_ui.cc
@@ -6,12 +6,12 @@
#include "app/l10n_util.h"
#include "app/resource_bundle.h"
+#include "base/i18n/time_formatting.h"
#include "base/message_loop.h"
#include "base/string_piece.h"
#include "base/string_util.h"
#include "base/thread.h"
#include "base/time.h"
-#include "base/time_format.h"
#include "base/values.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/browser/download/save_page_uitest.cc b/chrome/browser/download/save_page_uitest.cc
index 1149397..fbed636 100644
--- a/chrome/browser/download/save_page_uitest.cc
+++ b/chrome/browser/download/save_page_uitest.cc
@@ -6,7 +6,7 @@
#include "base/path_service.h"
#include "base/platform_thread.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/net/url_request_mock_http_job.h"
#include "chrome/browser/download/save_package.h"
diff --git a/chrome/browser/gtk/options/cookies_view.cc b/chrome/browser/gtk/options/cookies_view.cc
index 1cface429..71bdc24 100644
--- a/chrome/browser/gtk/options/cookies_view.cc
+++ b/chrome/browser/gtk/options/cookies_view.cc
@@ -9,9 +9,9 @@
#include "app/gfx/gtk_util.h"
#include "app/l10n_util.h"
+#include "base/i18n/time_formatting.h"
#include "base/message_loop.h"
#include "base/string_util.h"
-#include "base/time_format.h"
#include "chrome/browser/cookies_table_model.h"
#include "chrome/common/gtk_util.h"
#include "grit/generated_resources.h"
diff --git a/chrome/browser/history/query_parser.cc b/chrome/browser/history/query_parser.cc
index f3c4063..f17dad6 100644
--- a/chrome/browser/history/query_parser.cc
+++ b/chrome/browser/history/query_parser.cc
@@ -7,10 +7,10 @@
#include "chrome/browser/history/query_parser.h"
#include "app/l10n_util.h"
+#include "base/i18n/word_iterator.h"
#include "base/logging.h"
#include "base/scoped_vector.h"
#include "base/string_util.h"
-#include "base/word_iterator.h"
#include "unicode/uscript.h"
namespace {
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index 43ad23c..a949094 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -5,7 +5,7 @@
#include "chrome/browser/page_info_model.h"
#include "app/l10n_util.h"
-#include "base/time_format.h"
+#include "base/i18n/time_formatting.h"
#include "chrome/browser/cert_store.h"
#include "chrome/browser/profile.h"
#include "chrome/browser/ssl/ssl_manager.h"
diff --git a/chrome/browser/safe_browsing/database_perftest.cc b/chrome/browser/safe_browsing/database_perftest.cc
index bbf4839..90d3d989 100644
--- a/chrome/browser/safe_browsing/database_perftest.cc
+++ b/chrome/browser/safe_browsing/database_perftest.cc
@@ -16,7 +16,7 @@
#include "base/rand_util.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/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"
diff --git a/chrome/browser/sync/engine/auth_watcher_unittest.cc b/chrome/browser/sync/engine/auth_watcher_unittest.cc
index ca5192181..1233b00 100644
--- a/chrome/browser/sync/engine/auth_watcher_unittest.cc
+++ b/chrome/browser/sync/engine/auth_watcher_unittest.cc
@@ -4,7 +4,7 @@
#include "base/scoped_ptr.h"
#include "base/scoped_temp_dir.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/waitable_event.h"
#include "chrome/browser/sync/engine/all_status.h"
#include "chrome/browser/sync/engine/auth_watcher.h"
diff --git a/chrome/browser/sync/util/user_settings_unittest.cc b/chrome/browser/sync/util/user_settings_unittest.cc
index d30e04f..952c86b 100644
--- a/chrome/browser/sync/util/user_settings_unittest.cc
+++ b/chrome/browser/sync/util/user_settings_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE entry.
#include "base/file_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/util/user_settings.h"
#include "chrome/browser/sync/util/query_helpers.h"
diff --git a/chrome/browser/visitedlink_perftest.cc b/chrome/browser/visitedlink_perftest.cc
index c1c6afa..295d8dc 100644
--- a/chrome/browser/visitedlink_perftest.cc
+++ b/chrome/browser/visitedlink_perftest.cc
@@ -11,7 +11,7 @@
#include "base/perftimer.h"
#include "base/shared_memory.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "chrome/browser/visitedlink_master.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/common/pref_service_uitest.cc b/chrome/common/pref_service_uitest.cc
index 00f05a04..04430b5b 100644
--- a/chrome/common/pref_service_uitest.cc
+++ b/chrome/common/pref_service_uitest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,7 +7,7 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/gfx/rect.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/values.h"
#include "build/build_config.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/common/time_format.cc b/chrome/common/time_format.cc
index f1d4d71..e6dd6ac 100644
--- a/chrome/common/time_format.cc
+++ b/chrome/common/time_format.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -7,13 +7,13 @@
#include <vector>
#include "app/l10n_util.h"
+#include "base/i18n/time_formatting.h"
#include "base/logging.h"
#include "base/scoped_ptr.h"
#include "base/singleton.h"
#include "base/stl_util-inl.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "base/time_format.h"
#include "grit/generated_resources.h"
#include "unicode/datefmt.h"
#include "unicode/locid.h"
diff --git a/chrome/test/in_process_browser_test.cc b/chrome/test/in_process_browser_test.cc
index 89f128a..2913de16 100644
--- a/chrome/test/in_process_browser_test.cc
+++ b/chrome/test/in_process_browser_test.cc
@@ -8,7 +8,7 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/path_service.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "chrome/browser/browser.h"
#include "chrome/browser/browser_list.h"
#include "chrome/browser/browser_process.h"
diff --git a/chrome/test/perf/perftests.cc b/chrome/test/perf/perftests.cc
index 1e32a24..904d44e 100644
--- a/chrome/test/perf/perftests.cc
+++ b/chrome/test/perf/perftests.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/message_loop.h"
-#include "base/perf_test_suite.h"
+#include "base/test/perf_test_suite.h"
#include "chrome/common/chrome_paths.cc"
int main(int argc, char **argv) {
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index d3e6a48..35ff013 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -41,11 +41,11 @@
#include "base/file_util.h"
#include "base/file_version_info.h"
#include "base/keyboard_codes.h"
+#include "base/i18n/time_formatting.h"
#include "base/path_service.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/time.h"
-#include "base/time_format.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 7e52741..ec874f20 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -6,7 +6,7 @@
#include "base/path_service.h"
#include "base/platform_thread.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/time.h"
#include "chrome/common/chrome_constants.h"
#include "chrome/common/chrome_paths.h"
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index 8308ca0..8ff8f64 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -15,7 +15,7 @@
#include "base/process_util.h"
#include "base/scoped_ptr.h"
#include "base/string_util.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
#include "base/time.h"
#include "chrome/app/chrome_dll_resource.h"
#include "chrome/browser/net/url_fixer_upper.h"
diff --git a/chrome/test/unit/chrome_test_suite.h b/chrome/test/unit/chrome_test_suite.h
index 15d262db..52dcc2c 100644
--- a/chrome/test/unit/chrome_test_suite.h
+++ b/chrome/test/unit/chrome_test_suite.h
@@ -19,7 +19,7 @@
#include "base/path_service.h"
#include "base/ref_counted.h"
#include "base/scoped_nsautorelease_pool.h"
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
#include "chrome/app/scoped_ole_initializer.h"
#include "chrome/browser/browser_process.h"
#include "chrome/common/chrome_constants.h"
diff --git a/chrome/tools/convert_dict/convert_dict.cc b/chrome/tools/convert_dict/convert_dict.cc
index 4f8a862..f400155 100644
--- a/chrome/tools/convert_dict/convert_dict.cc
+++ b/chrome/tools/convert_dict/convert_dict.cc
@@ -15,7 +15,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/process_util.h"
#include "base/string_util.h"
diff --git a/chrome/tools/perf/flush_cache/flush_cache.cc b/chrome/tools/perf/flush_cache/flush_cache.cc
index 5fe9296..1e5d8e5 100644
--- a/chrome/tools/perf/flush_cache/flush_cache.cc
+++ b/chrome/tools/perf/flush_cache/flush_cache.cc
@@ -9,7 +9,7 @@
#include "base/string_piece.h"
#include "base/process_util.h"
#include "base/sys_string_conversions.h"
-#include "base/test_file_util.h"
+#include "base/test/test_file_util.h"
int main(int argc, const char* argv[]) {
base::EnableTerminationOnHeapCorruption();
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index e55c0a8..f8ac76f6 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -378,7 +378,7 @@
'sources': [
'../base/perf_test_suite.h',
'../base/perftimer.cc',
- '../base/test_file_util.h',
+ '../base/test/test_file_util.h',
'../chrome/test/chrome_process_util.cc',
'../chrome/test/chrome_process_util.h',
'../chrome/test/ui/ui_test.cc',
diff --git a/courgette/encoded_program_fuzz_unittest.cc b/courgette/encoded_program_fuzz_unittest.cc
index aa82919..ccbf787 100644
--- a/courgette/encoded_program_fuzz_unittest.cc
+++ b/courgette/encoded_program_fuzz_unittest.cc
@@ -16,7 +16,7 @@
#include "base/path_service.h"
#include "base/file_util.h"
#include "base/string_util.h"
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
#include "courgette/courgette.h"
#include "courgette/streams.h"
diff --git a/courgette/run_all_unittests.cc b/courgette/run_all_unittests.cc
index b5fc4a6..841b3532 100644
--- a/courgette/run_all_unittests.cc
+++ b/courgette/run_all_unittests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
int main(int argc, char** argv) {
return TestSuite(argc, argv).Run();
diff --git a/ipc/ipc_tests.cc b/ipc/ipc_tests.cc
index 43a368c..901427d 100644
--- a/ipc/ipc_tests.cc
+++ b/ipc/ipc_tests.cc
@@ -26,8 +26,8 @@
#include "base/global_descriptors_posix.h"
#endif
#include "base/perftimer.h"
-#include "base/perf_test_suite.h"
-#include "base/test_suite.h"
+#include "base/test/perf_test_suite.h"
+#include "base/test/test_suite.h"
#include "base/thread.h"
#include "ipc/ipc_descriptors.h"
#include "ipc/ipc_channel.h"
diff --git a/media/base/run_all_unittests.cc b/media/base/run_all_unittests.cc
index d9f6b58..b9a5529 100644
--- a/media/base/run_all_unittests.cc
+++ b/media/base/run_all_unittests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
int main(int argc, char** argv) {
return TestSuite(argc, argv).Run();
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..4eab41def 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 65958428..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"
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 0864d4bc..e847fe5 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -14,7 +14,7 @@
#include "base/singleton.h"
#include "base/string_util.h"
#include "base/time.h"
-#include "base/time_format.h"
+#include "base/i18n/time_formatting.h"
#include "printing/page_number.h"
#include "printing/page_overlays.h"
#include "printing/printed_pages_source.h"
diff --git a/printing/run_all_unittests.cc b/printing/run_all_unittests.cc
index d9f6b58..b9a5529 100644
--- a/printing/run_all_unittests.cc
+++ b/printing/run_all_unittests.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/test_suite.h"
+#include "base/test/test_suite.h"
int main(int argc, char** argv) {
return TestSuite(argc, argv).Run();
diff --git a/webkit/glue/context_menu_client_impl.cc b/webkit/glue/context_menu_client_impl.cc
index ce735bf..57f8c87 100644
--- a/webkit/glue/context_menu_client_impl.cc
+++ b/webkit/glue/context_menu_client_impl.cc
@@ -20,8 +20,8 @@
#include "Widget.h"
#undef LOG
+#include "base/i18n/word_iterator.h"
#include "base/string_util.h"
-#include "base/word_iterator.h"
#include "webkit/api/public/WebContextMenuData.h"
#include "webkit/api/public/WebFrame.h"
#include "webkit/api/public/WebPoint.h"
diff --git a/webkit/tools/test_shell/run_all_tests.cc b/webkit/tools/test_shell/run_all_tests.cc
index 94c08b7..463ade6 100644
--- a/webkit/tools/test_shell/run_all_tests.cc
+++ b/webkit/tools/test_shell/run_all_tests.cc
@@ -14,7 +14,7 @@
#include "base/at_exit.h"
#include "base/command_line.h"
-#include "base/icu_util.h"
+#include "base/i18n/icu_util.h"
#if defined(OS_MACOSX)
#include "base/mac_util.h"
#include "base/path_service.h"
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 4de3869..988eb604 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -13,7 +13,6 @@
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/gfx/size.h"
-#include "base/icu_util.h"
#if defined(OS_MACOSX)
#include "base/mac_util.h"
#endif
diff --git a/webkit/tools/test_shell/test_shell_mac.mm b/webkit/tools/test_shell/test_shell_mac.mm
index 7f48e9e..b15d789 100644
--- a/webkit/tools/test_shell/test_shell_mac.mm
+++ b/webkit/tools/test_shell/test_shell_mac.mm
@@ -15,7 +15,6 @@
#include "base/debug_util.h"
#include "base/file_util.h"
#include "base/gfx/size.h"
-#include "base/icu_util.h"
#include "base/logging.h"
#include "base/mac_util.h"
#include "base/memory_debug.h"
diff --git a/webkit/tools/test_shell/test_shell_main.cc b/webkit/tools/test_shell/test_shell_main.cc
index 783f7aa..3b00164 100644
--- a/webkit/tools/test_shell/test_shell_main.cc
+++ b/webkit/tools/test_shell/test_shell_main.cc
@@ -8,7 +8,7 @@
#include "base/event_recorder.h"
#include "base/file_path.h"
#include "base/file_util.h"
-#include "base/icu_util.h"
+#include "base/i18n/icu_util.h"
#include "base/memory_debug.h"
#include "base/message_loop.h"
#include "base/path_service.h"