summaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
Diffstat (limited to 'components')
-rw-r--r--components/autofill/content/browser/autocheckout/whitelist_manager.h2
-rw-r--r--components/autofill/content/browser/risk/fingerprint.cc2
-rw-r--r--components/autofill/content/browser/wallet/wallet_client.h2
-rw-r--r--components/autofill/content/browser/wallet/wallet_signin_helper.cc2
-rw-r--r--components/autofill/content/browser/wallet/wallet_test_util.cc2
-rw-r--r--components/autofill/content/renderer/autofill_agent.cc2
-rw-r--r--components/autofill/content/renderer/autofill_agent.h4
-rw-r--r--components/autofill/core/browser/autofill_download.h2
-rw-r--r--components/autofill/core/browser/autofill_manager.h2
-rw-r--r--components/autofill/core/browser/autofill_manager_unittest.cc2
-rw-r--r--components/autofill/core/browser/autofill_metrics.cc2
-rw-r--r--components/autofill/core/browser/autofill_metrics_unittest.cc2
-rw-r--r--components/autofill/core/browser/credit_card.cc2
-rw-r--r--components/autofill/core/browser/form_structure.cc2
-rw-r--r--components/autofill/core/browser/validation.cc2
-rw-r--r--components/autofill/core/browser/validation_unittest.cc2
-rw-r--r--components/autofill/core/browser/webdata/autofill_entry.h2
-rw-r--r--components/autofill/core/browser/webdata/autofill_entry_unittest.cc2
-rw-r--r--components/autofill/core/browser/webdata/autofill_table.cc2
-rw-r--r--components/autofill/core/browser/webdata/autofill_table_unittest.cc2
-rw-r--r--components/autofill/core/browser/webdata/web_data_service_unittest.cc2
-rw-r--r--components/autofill/core/common/autofill_messages.h2
-rw-r--r--components/sessions/serialized_navigation_entry.h2
-rw-r--r--components/sessions/serialized_navigation_entry_test_helper.cc2
-rw-r--r--components/sessions/serialized_navigation_entry_unittest.cc2
-rw-r--r--components/visitedlink/browser/visitedlink_event_listener.h2
-rw-r--r--components/visitedlink/test/visitedlink_unittest.cc2
-rw-r--r--components/webdata/common/web_database_migration_unittest.cc2
-rw-r--r--components/webdata/encryptor/ie7_password.h2
29 files changed, 30 insertions, 30 deletions
diff --git a/components/autofill/content/browser/autocheckout/whitelist_manager.h b/components/autofill/content/browser/autocheckout/whitelist_manager.h
index 8437d91..7368d95 100644
--- a/components/autofill/content/browser/autocheckout/whitelist_manager.h
+++ b/components/autofill/content/browser/autocheckout/whitelist_manager.h
@@ -8,7 +8,7 @@
#include <string>
#include <vector>
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "components/autofill/core/browser/autofill_metrics.h"
#include "net/url_request/url_fetcher_delegate.h"
diff --git a/components/autofill/content/browser/risk/fingerprint.cc b/components/autofill/content/browser/risk/fingerprint.cc
index 631d0e9..a827edc 100644
--- a/components/autofill/content/browser/risk/fingerprint.cc
+++ b/components/autofill/content/browser/risk/fingerprint.cc
@@ -19,7 +19,7 @@
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
#include "base/sys_info.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
#include "components/autofill/content/browser/risk/proto/fingerprint.pb.h"
#include "content/public/browser/browser_thread.h"
diff --git a/components/autofill/content/browser/wallet/wallet_client.h b/components/autofill/content/browser/wallet/wallet_client.h
index b3b1d74a..a76eba4 100644
--- a/components/autofill/content/browser/wallet/wallet_client.h
+++ b/components/autofill/content/browser/wallet/wallet_client.h
@@ -11,7 +11,7 @@
#include "base/callback.h" // For base::Closure.
#include "base/memory/ref_counted.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
#include "components/autofill/content/browser/autocheckout_statistic.h"
#include "components/autofill/content/browser/wallet/encryption_escrow_client.h"
diff --git a/components/autofill/content/browser/wallet/wallet_signin_helper.cc b/components/autofill/content/browser/wallet/wallet_signin_helper.cc
index 9b083b1..ac0347e 100644
--- a/components/autofill/content/browser/wallet/wallet_signin_helper.cc
+++ b/components/autofill/content/browser/wallet/wallet_signin_helper.cc
@@ -10,7 +10,7 @@
#include "base/rand_util.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
#include "components/autofill/content/browser/wallet/wallet_service_url.h"
#include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
diff --git a/components/autofill/content/browser/wallet/wallet_test_util.cc b/components/autofill/content/browser/wallet/wallet_test_util.cc
index ebe4556..8360e1a 100644
--- a/components/autofill/content/browser/wallet/wallet_test_util.cc
+++ b/components/autofill/content/browser/wallet/wallet_test_util.cc
@@ -9,7 +9,7 @@
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
#include "components/autofill/content/browser/wallet/full_wallet.h"
#include "components/autofill/content/browser/wallet/instrument.h"
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index b8a08b05..61e267e 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -10,7 +10,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/content/renderer/form_autofill_util.h"
#include "components/autofill/content/renderer/page_click_tracker.h"
#include "components/autofill/content/renderer/password_autofill_agent.h"
diff --git a/components/autofill/content/renderer/autofill_agent.h b/components/autofill/content/renderer/autofill_agent.h
index 4e2db12..4f03944 100644
--- a/components/autofill/content/renderer/autofill_agent.h
+++ b/components/autofill/content/renderer/autofill_agent.h
@@ -11,8 +11,8 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
#include "base/memory/weak_ptr.h"
-#include "base/time.h"
-#include "base/timer.h"
+#include "base/time/time.h"
+#include "base/timer/timer.h"
#include "components/autofill/content/renderer/form_cache.h"
#include "components/autofill/content/renderer/page_click_listener.h"
#include "components/autofill/core/common/forms_seen_state.h"
diff --git a/components/autofill/core/browser/autofill_download.h b/components/autofill/core/browser/autofill_download.h
index 09cc1cf..21949ad 100644
--- a/components/autofill/core/browser/autofill_download.h
+++ b/components/autofill/core/browser/autofill_download.h
@@ -14,7 +14,7 @@
#include "base/compiler_specific.h"
#include "base/gtest_prod_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_type.h"
#include "net/url_request/url_fetcher_delegate.h"
diff --git a/components/autofill/core/browser/autofill_manager.h b/components/autofill/core/browser/autofill_manager.h
index eabc19a..c46593f 100644
--- a/components/autofill/core/browser/autofill_manager.h
+++ b/components/autofill/core/browser/autofill_manager.h
@@ -18,7 +18,7 @@
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/content/browser/autocheckout_manager.h"
#include "components/autofill/core/browser/autocomplete_history_manager.h"
#include "components/autofill/core/browser/autofill_download.h"
diff --git a/components/autofill/core/browser/autofill_manager_unittest.cc b/components/autofill/core/browser/autofill_manager_unittest.cc
index 90fc12b..d7da81c 100644
--- a/components/autofill/core/browser/autofill_manager_unittest.cc
+++ b/components/autofill/core/browser/autofill_manager_unittest.cc
@@ -14,7 +14,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tuple.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/password_manager/password_manager.h"
diff --git a/components/autofill/core/browser/autofill_metrics.cc b/components/autofill/core/browser/autofill_metrics.cc
index 2b95147..2959106 100644
--- a/components/autofill/core/browser/autofill_metrics.cc
+++ b/components/autofill/core/browser/autofill_metrics.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/metrics/histogram.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_type.h"
#include "components/autofill/core/browser/form_structure.h"
#include "components/autofill/core/common/form_data.h"
diff --git a/components/autofill/core/browser/autofill_metrics_unittest.cc b/components/autofill/core/browser/autofill_metrics_unittest.cc
index ab16e87..df38681 100644
--- a/components/autofill/core/browser/autofill_metrics_unittest.cc
+++ b/components/autofill/core/browser/autofill_metrics_unittest.cc
@@ -8,7 +8,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
#include "chrome/browser/autofill/personal_data_manager_factory.h"
#include "chrome/browser/ui/autofill/tab_autofill_manager_delegate.h"
diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc
index ea41214..9906f27 100644
--- a/components/autofill/core/browser/credit_card.cc
+++ b/components/autofill/core/browser/credit_card.cc
@@ -17,7 +17,7 @@
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_field.h"
#include "components/autofill/core/browser/autofill_regexes.h"
#include "components/autofill/core/browser/autofill_type.h"
diff --git a/components/autofill/core/browser/form_structure.cc b/components/autofill/core/browser/form_structure.cc
index b85e73e..c940311 100644
--- a/components/autofill/core/browser/form_structure.cc
+++ b/components/autofill/core/browser/form_structure.cc
@@ -15,7 +15,7 @@
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/content/browser/autocheckout_page_meta_data.h"
#include "components/autofill/core/browser/autofill_metrics.h"
#include "components/autofill/core/browser/autofill_type.h"
diff --git a/components/autofill/core/browser/validation.cc b/components/autofill/core/browser/validation.cc
index 5922b73..9d561f51 100644
--- a/components/autofill/core/browser/validation.cc
+++ b/components/autofill/core/browser/validation.cc
@@ -8,7 +8,7 @@
#include "base/strings/string_piece.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_regexes.h"
#include "components/autofill/core/browser/credit_card.h"
#include "components/autofill/core/browser/state_names.h"
diff --git a/components/autofill/core/browser/validation_unittest.cc b/components/autofill/core/browser/validation_unittest.cc
index d01b0bc..c6f6e65 100644
--- a/components/autofill/core/browser/validation_unittest.cc
+++ b/components/autofill/core/browser/validation_unittest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/validation.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/core/browser/webdata/autofill_entry.h b/components/autofill/core/browser/webdata/autofill_entry.h
index 4e274d8..33a467d 100644
--- a/components/autofill/core/browser/webdata/autofill_entry.h
+++ b/components/autofill/core/browser/webdata/autofill_entry.h
@@ -10,7 +10,7 @@
#include "base/gtest_prod_util.h"
#include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
namespace autofill {
diff --git a/components/autofill/core/browser/webdata/autofill_entry_unittest.cc b/components/autofill/core/browser/webdata/autofill_entry_unittest.cc
index dfcd884..bef7d57 100644
--- a/components/autofill/core/browser/webdata/autofill_entry_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_entry_unittest.cc
@@ -5,7 +5,7 @@
#include <algorithm>
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/webdata/autofill_entry.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/core/browser/webdata/autofill_table.cc b/components/autofill/core/browser/webdata/autofill_table.cc
index 4163b87..c1c6bf9 100644
--- a/components/autofill/core/browser/webdata/autofill_table.cc
+++ b/components/autofill/core/browser/webdata/autofill_table.cc
@@ -15,7 +15,7 @@
#include "base/i18n/case_conversion.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/tuple.h"
#include "components/autofill/core/browser/autofill_country.h"
#include "components/autofill/core/browser/autofill_profile.h"
diff --git a/components/autofill/core/browser/webdata/autofill_table_unittest.cc b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
index 5bea76d..eff54f8 100644
--- a/components/autofill/core/browser/webdata/autofill_table_unittest.cc
+++ b/components/autofill/core/browser/webdata/autofill_table_unittest.cc
@@ -11,7 +11,7 @@
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/browser/autofill_profile.h"
#include "components/autofill/core/browser/autofill_type.h"
#include "components/autofill/core/browser/credit_card.h"
diff --git a/components/autofill/core/browser/webdata/web_data_service_unittest.cc b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
index d1eaf17..28aca50 100644
--- a/components/autofill/core/browser/webdata/web_data_service_unittest.cc
+++ b/components/autofill/core/browser/webdata/web_data_service_unittest.cc
@@ -16,7 +16,7 @@
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/synchronization/waitable_event.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "chrome/browser/webdata/web_data_service.h"
#include "components/autofill/core/browser/autofill_country.h"
#include "components/autofill/core/browser/autofill_profile.h"
diff --git a/components/autofill/core/common/autofill_messages.h b/components/autofill/core/common/autofill_messages.h
index 757c399..2e94713 100644
--- a/components/autofill/core/common/autofill_messages.h
+++ b/components/autofill/core/common/autofill_messages.h
@@ -6,7 +6,7 @@
#include <string>
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/autofill/core/common/autocheckout_status.h"
#include "components/autofill/core/common/form_data.h"
#include "components/autofill/core/common/form_data_predictions.h"
diff --git a/components/sessions/serialized_navigation_entry.h b/components/sessions/serialized_navigation_entry.h
index 2a1deec..1869897 100644
--- a/components/sessions/serialized_navigation_entry.h
+++ b/components/sessions/serialized_navigation_entry.h
@@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string16.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/sessions/sessions_export.h"
#include "content/public/common/page_state.h"
#include "content/public/common/page_transition_types.h"
diff --git a/components/sessions/serialized_navigation_entry_test_helper.cc b/components/sessions/serialized_navigation_entry_test_helper.cc
index b373a84..b134a18 100644
--- a/components/sessions/serialized_navigation_entry_test_helper.cc
+++ b/components/sessions/serialized_navigation_entry_test_helper.cc
@@ -5,7 +5,7 @@
#include "components/sessions/serialized_navigation_entry_test_helper.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/sessions/serialized_navigation_entry.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/sessions/serialized_navigation_entry_unittest.cc b/components/sessions/serialized_navigation_entry_unittest.cc
index 5902347..d76a88b 100644
--- a/components/sessions/serialized_navigation_entry_unittest.cc
+++ b/components/sessions/serialized_navigation_entry_unittest.cc
@@ -13,7 +13,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "content/public/browser/favicon_status.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/common/page_transition_types.h"
diff --git a/components/visitedlink/browser/visitedlink_event_listener.h b/components/visitedlink/browser/visitedlink_event_listener.h
index 257a4aa..c2de5d2 100644
--- a/components/visitedlink/browser/visitedlink_event_listener.h
+++ b/components/visitedlink/browser/visitedlink_event_listener.h
@@ -8,7 +8,7 @@
#include <map>
#include "base/memory/linked_ptr.h"
-#include "base/timer.h"
+#include "base/timer/timer.h"
#include "components/visitedlink/browser/visitedlink_master.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index 47d4efc..ded5ef5 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -13,7 +13,7 @@
#include "base/run_loop.h"
#include "base/shared_memory.h"
#include "base/strings/string_util.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "components/visitedlink/browser/visitedlink_delegate.h"
#include "components/visitedlink/browser/visitedlink_event_listener.h"
#include "components/visitedlink/browser/visitedlink_master.h"
diff --git a/components/webdata/common/web_database_migration_unittest.cc b/components/webdata/common/web_database_migration_unittest.cc
index d93fce5..739005d 100644
--- a/components/webdata/common/web_database_migration_unittest.cc
+++ b/components/webdata/common/web_database_migration_unittest.cc
@@ -12,7 +12,7 @@
#include "base/strings/string16.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/time.h"
+#include "base/time/time.h"
#include "base/values.h"
#include "chrome/browser/webdata/keyword_table.h"
#include "chrome/browser/webdata/logins_table.h"
diff --git a/components/webdata/encryptor/ie7_password.h b/components/webdata/encryptor/ie7_password.h
index 812dae3..4584266 100644
--- a/components/webdata/encryptor/ie7_password.h
+++ b/components/webdata/encryptor/ie7_password.h
@@ -10,7 +10,7 @@
#include <vector>
#include "base/basictypes.h"
-#include "base/time.h"
+#include "base/time/time.h"
// Contains the information read from the IE7/IE8 Storage2 key in the registry.
struct IE7PasswordInfo {