diff options
Diffstat (limited to 'chrome/browser/history')
31 files changed, 33 insertions, 33 deletions
diff --git a/chrome/browser/history/android/android_cache_database.h b/chrome/browser/history/android/android_cache_database.h index 829efb3..17e81f6 100644 --- a/chrome/browser/history/android/android_cache_database.h +++ b/chrome/browser/history/android/android_cache_database.h @@ -5,7 +5,7 @@ #ifndef CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ #define CHROME_BROWSER_HISTORY_ANDROID_ANDROID_CACHE_DATABASE_H_ -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/time.h" #include "chrome/browser/history/android/android_history_types.h" diff --git a/chrome/browser/history/android/android_cache_database_unittest.cc b/chrome/browser/history/android/android_cache_database_unittest.cc index 77382a8..d8fb0d5 100644 --- a/chrome/browser/history/android/android_cache_database_unittest.cc +++ b/chrome/browser/history/android/android_cache_database_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/android/android_cache_database.h" diff --git a/chrome/browser/history/android/android_provider_backend.h b/chrome/browser/history/android/android_provider_backend.h index bc1ab16..7cc8644 100644 --- a/chrome/browser/history/android/android_provider_backend.h +++ b/chrome/browser/history/android/android_provider_backend.h @@ -7,7 +7,7 @@ #include <set> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/hash_tables.h" #include "base/memory/ref_counted.h" diff --git a/chrome/browser/history/android/android_provider_backend_unittest.cc b/chrome/browser/history/android/android_provider_backend_unittest.cc index be9e0c9..b26e368 100644 --- a/chrome/browser/history/android/android_provider_backend_unittest.cc +++ b/chrome/browser/history/android/android_provider_backend_unittest.cc @@ -6,8 +6,8 @@ #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/stringprintf.h" diff --git a/chrome/browser/history/android/android_urls_database_unittest.cc b/chrome/browser/history/android/android_urls_database_unittest.cc index 8a4e1a7..cf970e5 100644 --- a/chrome/browser/history/android/android_urls_database_unittest.cc +++ b/chrome/browser/history/android/android_urls_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/android/android_urls_database.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "chrome/browser/history/history_database.h" diff --git a/chrome/browser/history/android/urls_sql_handler_unittest.cc b/chrome/browser/history/android/urls_sql_handler_unittest.cc index 7d79a6e..06bfa79 100644 --- a/chrome/browser/history/android/urls_sql_handler_unittest.cc +++ b/chrome/browser/history/android/urls_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/urls_sql_handler.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/android/visit_sql_handler_unittest.cc b/chrome/browser/history/android/visit_sql_handler_unittest.cc index c54827a..a299468 100644 --- a/chrome/browser/history/android/visit_sql_handler_unittest.cc +++ b/chrome/browser/history/android/visit_sql_handler_unittest.cc @@ -6,8 +6,8 @@ #include "chrome/browser/history/android/visit_sql_handler.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/download_database.cc b/chrome/browser/history/download_database.cc index 0a0ba8f..0b91d4d 100644 --- a/chrome/browser/history/download_database.cc +++ b/chrome/browser/history/download_database.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/debug/alias.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" #include "base/metrics/histogram.h" #include "base/stl_util.h" diff --git a/chrome/browser/history/download_row.h b/chrome/browser/history/download_row.h index f1435cb1..2f8b63b 100644 --- a/chrome/browser/history/download_row.h +++ b/chrome/browser/history/download_row.h @@ -7,7 +7,7 @@ #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/time.h" #include "content/public/browser/download_danger_type.h" #include "content/public/browser/download_interrupt_reasons.h" diff --git a/chrome/browser/history/expire_history_backend_unittest.cc b/chrome/browser/history/expire_history_backend_unittest.cc index 3a9c08d..93fc873 100644 --- a/chrome/browser/history/expire_history_backend_unittest.cc +++ b/chrome/browser/history/expire_history_backend_unittest.cc @@ -8,8 +8,8 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h index c92fcfe..04c5c82 100644 --- a/chrome/browser/history/history_backend.h +++ b/chrome/browser/history/history_backend.h @@ -11,7 +11,7 @@ #include <vector> #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/archived_database.h" diff --git a/chrome/browser/history/history_backend_unittest.cc b/chrome/browser/history/history_backend_unittest.cc index ba6c328..240b169 100644 --- a/chrome/browser/history/history_backend_unittest.cc +++ b/chrome/browser/history/history_backend_unittest.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" diff --git a/chrome/browser/history/history_database_unittest.cc b/chrome/browser/history/history_database_unittest.cc index e5354ad..06cac35 100644 --- a/chrome/browser/history/history_database_unittest.cc +++ b/chrome/browser/history/history_database_unittest.cc @@ -4,8 +4,8 @@ #include "chrome/browser/history/history_database.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "chrome/common/chrome_paths.h" diff --git a/chrome/browser/history/history_querying_unittest.cc b/chrome/browser/history/history_querying_unittest.cc index d1cf16b..c1355dd 100644 --- a/chrome/browser/history/history_querying_unittest.cc +++ b/chrome/browser/history/history_querying_unittest.cc @@ -5,8 +5,8 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h index fd0a669..f39bef0 100644 --- a/chrome/browser/history/history_service.h +++ b/chrome/browser/history/history_service.h @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/history_unittest.cc b/chrome/browser/history/history_unittest.cc index 1cedb19..83e7b22 100644 --- a/chrome/browser/history/history_unittest.cc +++ b/chrome/browser/history/history_unittest.cc @@ -28,8 +28,8 @@ #include "base/callback.h" #include "base/command_line.h" #include "base/compiler_specific.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/in_memory_database.cc b/chrome/browser/history/in_memory_database.cc index 27b8a34..02b335f 100644 --- a/chrome/browser/history/in_memory_database.cc +++ b/chrome/browser/history/in_memory_database.cc @@ -4,7 +4,7 @@ #include "chrome/browser/history/in_memory_database.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/logging.h" #include "base/metrics/histogram.h" #include "base/time.h" diff --git a/chrome/browser/history/in_memory_url_index.h b/chrome/browser/history/in_memory_url_index.h index 557793c..4190c2e 100644 --- a/chrome/browser/history/in_memory_url_index.h +++ b/chrome/browser/history/in_memory_url_index.h @@ -12,7 +12,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/history/in_memory_url_index_unittest.cc b/chrome/browser/history/in_memory_url_index_unittest.cc index e03f42c..8cd4790 100644 --- a/chrome/browser/history/in_memory_url_index_unittest.cc +++ b/chrome/browser/history/in_memory_url_index_unittest.cc @@ -6,8 +6,8 @@ #include <fstream> #include "base/auto_reset.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" diff --git a/chrome/browser/history/shortcuts_backend.h b/chrome/browser/history/shortcuts_backend.h index 1609e71..2f7eccc 100644 --- a/chrome/browser/history/shortcuts_backend.h +++ b/chrome/browser/history/shortcuts_backend.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" diff --git a/chrome/browser/history/shortcuts_database.h b/chrome/browser/history/shortcuts_database.h index 594150a..538ea65 100644 --- a/chrome/browser/history/shortcuts_database.h +++ b/chrome/browser/history/shortcuts_database.h @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" #include "base/string16.h" diff --git a/chrome/browser/history/text_database.h b/chrome/browser/history/text_database.h index 99ccff0..cf43848 100644 --- a/chrome/browser/history/text_database.h +++ b/chrome/browser/history/text_database.h @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/history/text_database_manager.h b/chrome/browser/history/text_database_manager.h index 8d4b296..66e8210 100644 --- a/chrome/browser/history/text_database_manager.h +++ b/chrome/browser/history/text_database_manager.h @@ -11,13 +11,13 @@ #include "base/basictypes.h" #include "base/containers/mru_cache.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/weak_ptr.h" #include "base/string16.h" #include "chrome/browser/history/history_types.h" -#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/query_parser.h" +#include "chrome/browser/history/text_database.h" #include "chrome/browser/history/url_database.h" namespace history { diff --git a/chrome/browser/history/text_database_manager_unittest.cc b/chrome/browser/history/text_database_manager_unittest.cc index 23402b9..8185773 100644 --- a/chrome/browser/history/text_database_manager_unittest.cc +++ b/chrome/browser/history/text_database_manager_unittest.cc @@ -4,8 +4,8 @@ #include <set> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/text_database_manager.h" diff --git a/chrome/browser/history/thumbnail_database_unittest.cc b/chrome/browser/history/thumbnail_database_unittest.cc index f041def..fc92feb 100644 --- a/chrome/browser/history/thumbnail_database_unittest.cc +++ b/chrome/browser/history/thumbnail_database_unittest.cc @@ -7,8 +7,8 @@ #include "base/basictypes.h" #include "base/command_line.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" diff --git a/chrome/browser/history/top_sites_backend.cc b/chrome/browser/history/top_sites_backend.cc index 93cf6e2..7a4e6e539 100644 --- a/chrome/browser/history/top_sites_backend.cc +++ b/chrome/browser/history/top_sites_backend.cc @@ -6,8 +6,8 @@ #include "base/bind.h" #include "base/bind_helpers.h" -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "chrome/browser/history/top_sites_database.h" #include "chrome/common/cancelable_task_tracker.h" diff --git a/chrome/browser/history/top_sites_backend.h b/chrome/browser/history/top_sites_backend.h index 5028286..e77705f 100644 --- a/chrome/browser/history/top_sites_backend.h +++ b/chrome/browser/history/top_sites_backend.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_HISTORY_TOP_SITES_BACKEND_H_ #include "base/callback.h" -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "chrome/browser/history/history_types.h" diff --git a/chrome/browser/history/top_sites_database_unittest.cc b/chrome/browser/history/top_sites_database_unittest.cc index ebd956b..8c509d3 100644 --- a/chrome/browser/history/top_sites_database_unittest.cc +++ b/chrome/browser/history/top_sites_database_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "chrome/browser/history/top_sites_database.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/history/url_database_unittest.cc b/chrome/browser/history/url_database_unittest.cc index 6b4cb28..d7c67cf 100644 --- a/chrome/browser/history/url_database_unittest.cc +++ b/chrome/browser/history/url_database_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_util.h" diff --git a/chrome/browser/history/url_index_private_data.h b/chrome/browser/history/url_index_private_data.h index d2d3ebb..cbb8692 100644 --- a/chrome/browser/history/url_index_private_data.h +++ b/chrome/browser/history/url_index_private_data.h @@ -8,11 +8,11 @@ #include <set> #include <string> -#include "base/file_path.h" +#include "base/files/file_path.h" #include "base/gtest_prod_util.h" #include "base/memory/ref_counted.h" -#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/in_memory_url_index_cache.pb.h" +#include "chrome/browser/history/in_memory_url_index_types.h" #include "chrome/browser/history/scored_history_match.h" #include "content/public/browser/notification_details.h" diff --git a/chrome/browser/history/visit_database_unittest.cc b/chrome/browser/history/visit_database_unittest.cc index a76bef5..bdc33fc 100644 --- a/chrome/browser/history/visit_database_unittest.cc +++ b/chrome/browser/history/visit_database_unittest.cc @@ -5,8 +5,8 @@ #include <set> #include <vector> -#include "base/file_path.h" #include "base/file_util.h" +#include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/string_util.h" |