diff options
Diffstat (limited to 'chrome')
65 files changed, 67 insertions, 65 deletions
diff --git a/chrome/browser/mac/keystone_glue.mm b/chrome/browser/mac/keystone_glue.mm index 2b34466..9013703 100644 --- a/chrome/browser/mac/keystone_glue.mm +++ b/chrome/browser/mac/keystone_glue.mm @@ -10,6 +10,7 @@ #include <vector> #include "base/file_util.h" +#include "base/location.h" #include "base/logging.h" #include "base/mac/mac_util.h" #include "base/mac/scoped_nsautorelease_pool.h" diff --git a/chrome/browser/metrics/metrics_reporting_scheduler.h b/chrome/browser/metrics/metrics_reporting_scheduler.h index 7774ec5..6392634 100644 --- a/chrome/browser/metrics/metrics_reporting_scheduler.h +++ b/chrome/browser/metrics/metrics_reporting_scheduler.h @@ -9,6 +9,7 @@ #include "base/basictypes.h" #include "base/callback.h" #include "base/task.h" +#include "base/time.h" // Scheduler task to drive a MetricsService object's uploading. class MetricsReportingScheduler { diff --git a/chrome/browser/prefs/pref_model_associator.cc b/chrome/browser/prefs/pref_model_associator.cc index 88c9640..17fa1307 100644 --- a/chrome/browser/prefs/pref_model_associator.cc +++ b/chrome/browser/prefs/pref_model_associator.cc @@ -6,8 +6,8 @@ #include "base/auto_reset.h" #include "base/json/json_reader.h" +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/sync/api/sync_change.h" diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 2c9de3e..19cb8fa 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/abstract_profile_sync_service_test.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/internal_api/write_transaction.h" #include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/directory_manager.h" diff --git a/chrome/browser/sync/api/sync_error.cc b/chrome/browser/sync/api/sync_error.cc index 6ffa495..453a920 100644 --- a/chrome/browser/sync/api/sync_error.cc +++ b/chrome/browser/sync/api/sync_error.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/api/sync_error.h" +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" SyncError::SyncError() { Clear(); diff --git a/chrome/browser/sync/api/sync_error_unittest.cc b/chrome/browser/sync/api/sync_error_unittest.cc index 6e2d9a8..1a2489f 100644 --- a/chrome/browser/sync/api/sync_error_unittest.cc +++ b/chrome/browser/sync/api/sync_error_unittest.cc @@ -6,7 +6,7 @@ #include <string> -#include "base/tracked.h" +#include "base/location.h" #include "testing/gtest/include/gtest/gtest.h" using std::string; diff --git a/chrome/browser/sync/api/syncable_service_mock.h b/chrome/browser/sync/api/syncable_service_mock.h index e1e6bf7..2575183 100644 --- a/chrome/browser/sync/api/syncable_service_mock.h +++ b/chrome/browser/sync/api/syncable_service_mock.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SYNC_API_SYNCABLE_SERVICE_MOCK_H_ #pragma once -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/api/sync_change.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/engine/apply_updates_command.cc b/chrome/browser/sync/engine/apply_updates_command.cc index 40ce3ec..6d1f958 100644 --- a/chrome/browser/sync/engine/apply_updates_command.cc +++ b/chrome/browser/sync/engine/apply_updates_command.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/engine/apply_updates_command.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/update_applicator.h" #include "chrome/browser/sync/sessions/sync_session.h" #include "chrome/browser/sync/syncable/directory_manager.h" diff --git a/chrome/browser/sync/engine/apply_updates_command_unittest.cc b/chrome/browser/sync/engine/apply_updates_command_unittest.cc index 8672a26..6214f34 100644 --- a/chrome/browser/sync/engine/apply_updates_command_unittest.cc +++ b/chrome/browser/sync/engine/apply_updates_command_unittest.cc @@ -5,8 +5,8 @@ #include <string> #include "base/format_macros.h" +#include "base/location.h" #include "base/stringprintf.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/apply_updates_command.h" #include "chrome/browser/sync/engine/nigori_util.h" #include "chrome/browser/sync/engine/syncer.h" diff --git a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc index cd02684..11f0aec 100644 --- a/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc +++ b/chrome/browser/sync/engine/build_and_process_conflict_sets_command.cc @@ -11,7 +11,7 @@ #include "base/basictypes.h" #include "base/format_macros.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/syncer_util.h" #include "chrome/browser/sync/engine/update_applicator.h" #include "chrome/browser/sync/sessions/sync_session.h" diff --git a/chrome/browser/sync/engine/conflict_resolver.cc b/chrome/browser/sync/engine/conflict_resolver.cc index 918b45f..25c2e18 100644 --- a/chrome/browser/sync/engine/conflict_resolver.cc +++ b/chrome/browser/sync/engine/conflict_resolver.cc @@ -8,8 +8,8 @@ #include <map> #include <set> +#include "base/location.h" #include "base/metrics/histogram.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_util.h" #include "chrome/browser/sync/protocol/service_constants.h" diff --git a/chrome/browser/sync/engine/post_commit_message_command.cc b/chrome/browser/sync/engine/post_commit_message_command.cc index abc4ee1..c9b4af4 100644 --- a/chrome/browser/sync/engine/post_commit_message_command.cc +++ b/chrome/browser/sync/engine/post_commit_message_command.cc @@ -6,7 +6,7 @@ #include <vector> -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/engine/syncproto.h" #include "chrome/browser/sync/sessions/sync_session.h" diff --git a/chrome/browser/sync/engine/process_commit_response_command.cc b/chrome/browser/sync/engine/process_commit_response_command.cc index e5c73a7..49f1fbf 100644 --- a/chrome/browser/sync/engine/process_commit_response_command.cc +++ b/chrome/browser/sync/engine/process_commit_response_command.cc @@ -9,7 +9,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/engine/syncer_util.h" #include "chrome/browser/sync/engine/syncproto.h" diff --git a/chrome/browser/sync/engine/process_commit_response_command_unittest.cc b/chrome/browser/sync/engine/process_commit_response_command_unittest.cc index a428622..2f5846c 100644 --- a/chrome/browser/sync/engine/process_commit_response_command_unittest.cc +++ b/chrome/browser/sync/engine/process_commit_response_command_unittest.cc @@ -4,8 +4,8 @@ #include <vector> +#include "base/location.h" #include "base/stringprintf.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/mock_model_safe_workers.h" #include "chrome/browser/sync/engine/process_commit_response_command.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/browser/sync/engine/process_updates_command.cc b/chrome/browser/sync/engine/process_updates_command.cc index 33d3399..b0aa54b 100644 --- a/chrome/browser/sync/engine/process_updates_command.cc +++ b/chrome/browser/sync/engine/process_updates_command.cc @@ -7,7 +7,7 @@ #include <vector> #include "base/basictypes.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/engine/syncer_util.h" diff --git a/chrome/browser/sync/engine/sync_scheduler.cc b/chrome/browser/sync/engine/sync_scheduler.cc index d7d68ab..14991e6 100644 --- a/chrome/browser/sync/engine/sync_scheduler.cc +++ b/chrome/browser/sync/engine/sync_scheduler.cc @@ -8,10 +8,10 @@ #include <cstring> #include "base/compiler_specific.h" +#include "base/location.h" #include "base/logging.h" #include "base/message_loop.h" #include "base/rand_util.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/protocol/proto_enum_conversions.h" diff --git a/chrome/browser/sync/engine/syncer.cc b/chrome/browser/sync/engine/syncer.cc index f9fa720..cf7cd97 100644 --- a/chrome/browser/sync/engine/syncer.cc +++ b/chrome/browser/sync/engine/syncer.cc @@ -4,9 +4,9 @@ #include "chrome/browser/sync/engine/syncer.h" +#include "base/location.h" #include "base/message_loop.h" #include "base/time.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/apply_updates_command.h" #include "chrome/browser/sync/engine/build_and_process_conflict_sets_command.h" #include "chrome/browser/sync/engine/build_commit_command.h" diff --git a/chrome/browser/sync/engine/syncer_unittest.cc b/chrome/browser/sync/engine/syncer_unittest.cc index d4242ed..1fd48e4 100644 --- a/chrome/browser/sync/engine/syncer_unittest.cc +++ b/chrome/browser/sync/engine/syncer_unittest.cc @@ -14,10 +14,10 @@ #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" -#include "base/tracked.h" +#include "base/stringprintf.h" #include "build/build_config.h" #include "chrome/browser/sync/engine/conflict_resolver.h" #include "chrome/browser/sync/engine/get_commit_ids_command.h" diff --git a/chrome/browser/sync/engine/syncer_util.cc b/chrome/browser/sync/engine/syncer_util.cc index 5d64bdd..ba21c3a 100644 --- a/chrome/browser/sync/engine/syncer_util.cc +++ b/chrome/browser/sync/engine/syncer_util.cc @@ -9,7 +9,7 @@ #include <string> #include <vector> -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/conflict_resolver.h" #include "chrome/browser/sync/engine/nigori_util.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" diff --git a/chrome/browser/sync/engine/verify_updates_command.cc b/chrome/browser/sync/engine/verify_updates_command.cc index fe83446..8d233e2 100644 --- a/chrome/browser/sync/engine/verify_updates_command.cc +++ b/chrome/browser/sync/engine/verify_updates_command.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/engine/verify_updates_command.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/syncer.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/engine/syncer_types.h" diff --git a/chrome/browser/sync/engine/verify_updates_command_unittest.cc b/chrome/browser/sync/engine/verify_updates_command_unittest.cc index a6fa195..c2d3eda 100644 --- a/chrome/browser/sync/engine/verify_updates_command_unittest.cc +++ b/chrome/browser/sync/engine/verify_updates_command_unittest.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/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/verify_updates_command.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/sessions/sync_session.h" diff --git a/chrome/browser/sync/glue/autofill_change_processor.cc b/chrome/browser/sync/glue/autofill_change_processor.cc index 8fe62de..54ce987 100644 --- a/chrome/browser/sync/glue/autofill_change_processor.cc +++ b/chrome/browser/sync/glue/autofill_change_processor.cc @@ -7,8 +7,8 @@ #include <string> #include <vector> +#include "base/location.h" #include "base/string_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/personal_data_manager.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/glue/autofill_model_associator.cc b/chrome/browser/sync/glue/autofill_model_associator.cc index d941bd7..fb45817 100644 --- a/chrome/browser/sync/glue/autofill_model_associator.cc +++ b/chrome/browser/sync/glue/autofill_model_associator.cc @@ -7,10 +7,10 @@ #include <functional> #include <vector> +#include "base/location.h" #include "base/string_number_conversions.h" #include "base/task.h" #include "base/time.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_profile.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/glue/autofill_profile_syncable_service.cc b/chrome/browser/sync/glue/autofill_profile_syncable_service.cc index 7be1e7b..aef0e43 100644 --- a/chrome/browser/sync/glue/autofill_profile_syncable_service.cc +++ b/chrome/browser/sync/glue/autofill_profile_syncable_service.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/glue/autofill_profile_syncable_service.h" +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/api/sync_error.h" @@ -414,4 +414,3 @@ AutofillProfileSyncableService::DataBundle::~DataBundle() { } } // namespace browser_sync - diff --git a/chrome/browser/sync/glue/autofill_profile_syncable_service_unittest.cc b/chrome/browser/sync/glue/autofill_profile_syncable_service_unittest.cc index 577b1a4..dc9433e 100644 --- a/chrome/browser/sync/glue/autofill_profile_syncable_service_unittest.cc +++ b/chrome/browser/sync/glue/autofill_profile_syncable_service_unittest.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/tracked.h" +#include "base/location.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/glue/autofill_profile_syncable_service.h" #include "chrome/browser/sync/internal_api/read_node_mock.h" @@ -262,4 +262,3 @@ TEST_F(AutofillProfileSyncableServiceTest, ActOnChange) { } } // namespace browser_sync - diff --git a/chrome/browser/sync/glue/bookmark_change_processor.cc b/chrome/browser/sync/glue/bookmark_change_processor.cc index 8ac8ec3..3735201 100644 --- a/chrome/browser/sync/glue/bookmark_change_processor.cc +++ b/chrome/browser/sync/glue/bookmark_change_processor.cc @@ -7,9 +7,9 @@ #include <stack> #include <vector> +#include "base/location.h" #include "base/string16.h" #include "base/string_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/bookmarks/bookmark_utils.h" diff --git a/chrome/browser/sync/glue/bookmark_model_associator.cc b/chrome/browser/sync/glue/bookmark_model_associator.cc index faa377b..4e1f26b 100644 --- a/chrome/browser/sync/glue/bookmark_model_associator.cc +++ b/chrome/browser/sync/glue/bookmark_model_associator.cc @@ -8,9 +8,9 @@ #include "base/command_line.h" #include "base/hash_tables.h" +#include "base/location.h" #include "base/message_loop.h" #include "base/task.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/sync/glue/data_type_controller.h b/chrome/browser/sync/glue/data_type_controller.h index 3108310..27b0460 100644 --- a/chrome/browser/sync/glue/data_type_controller.h +++ b/chrome/browser/sync/glue/data_type_controller.h @@ -10,7 +10,7 @@ #include <map> #include "base/callback.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/syncable/model_type.h" #include "chrome/browser/sync/unrecoverable_error_handler.h" diff --git a/chrome/browser/sync/glue/data_type_manager_mock.cc b/chrome/browser/sync/glue/data_type_manager_mock.cc index fa088ff..be50dbb 100644 --- a/chrome/browser/sync/glue/data_type_manager_mock.cc +++ b/chrome/browser/sync/glue/data_type_manager_mock.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/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/glue/data_type_manager_mock.h" #include "chrome/common/chrome_notification_types.h" diff --git a/chrome/browser/sync/glue/generic_change_processor.cc b/chrome/browser/sync/glue/generic_change_processor.cc index c55a222..8a064af2 100644 --- a/chrome/browser/sync/glue/generic_change_processor.cc +++ b/chrome/browser/sync/glue/generic_change_processor.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/glue/generic_change_processor.h" -#include "base/tracked.h" +#include "base/location.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/api/syncable_service.h" #include "chrome/browser/sync/api/sync_change.h" diff --git a/chrome/browser/sync/glue/model_associator_mock.h b/chrome/browser/sync/glue/model_associator_mock.h index 3474eff..6208233 100644 --- a/chrome/browser/sync/glue/model_associator_mock.h +++ b/chrome/browser/sync/glue/model_associator_mock.h @@ -6,7 +6,7 @@ #define CHROME_BROWSER_SYNC_GLUE_MODEL_ASSOCIATOR_MOCK_H__ #pragma once -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/model_associator.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/sync/glue/password_change_processor.cc b/chrome/browser/sync/glue/password_change_processor.cc index 325b486..715bdfb 100644 --- a/chrome/browser/sync/glue/password_change_processor.cc +++ b/chrome/browser/sync/glue/password_change_processor.cc @@ -6,8 +6,8 @@ #include <string> +#include "base/location.h" #include "base/string_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store_change.h" #include "chrome/browser/password_manager/password_store.h" diff --git a/chrome/browser/sync/glue/password_model_associator.cc b/chrome/browser/sync/glue/password_model_associator.cc index b853b3f..fecea08 100644 --- a/chrome/browser/sync/glue/password_model_associator.cc +++ b/chrome/browser/sync/glue/password_model_associator.cc @@ -6,8 +6,8 @@ #include <set> +#include "base/location.h" #include "base/stl_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/sync/api/sync_error.h" diff --git a/chrome/browser/sync/glue/session_model_associator.cc b/chrome/browser/sync/glue/session_model_associator.cc index f0c985f..d9becf5 100644 --- a/chrome/browser/sync/glue/session_model_associator.cc +++ b/chrome/browser/sync/glue/session_model_associator.cc @@ -8,9 +8,9 @@ #include <set> #include <utility> +#include "base/location.h" #include "base/logging.h" #include "base/sys_info.h" -#include "base/tracked.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_service_factory.h" diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc index 73c42a0..5f663ca 100644 --- a/chrome/browser/sync/glue/sync_backend_host.cc +++ b/chrome/browser/sync/glue/sync_backend_host.cc @@ -13,9 +13,9 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_util.h" +#include "base/location.h" #include "base/task.h" #include "base/threading/thread_restrictions.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/net/gaia/token_service.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/sync/glue/theme_change_processor.cc b/chrome/browser/sync/glue/theme_change_processor.cc index 586a412..2b6a77d 100644 --- a/chrome/browser/sync/glue/theme_change_processor.cc +++ b/chrome/browser/sync/glue/theme_change_processor.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/glue/theme_change_processor.h" +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/glue/theme_util.h" #include "chrome/browser/sync/internal_api/change_record.h" diff --git a/chrome/browser/sync/glue/theme_model_associator.cc b/chrome/browser/sync/glue/theme_model_associator.cc index 6b9ee5a..b854cbf 100644 --- a/chrome/browser/sync/glue/theme_model_associator.cc +++ b/chrome/browser/sync/glue/theme_model_associator.cc @@ -5,8 +5,8 @@ #include "chrome/browser/sync/glue/theme_model_associator.h" #include "base/basictypes.h" +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/sync/api/sync_error.h" #include "chrome/browser/sync/glue/sync_backend_host.h" diff --git a/chrome/browser/sync/glue/typed_url_change_processor.cc b/chrome/browser/sync/glue/typed_url_change_processor.cc index 15043ba..5845b8c 100644 --- a/chrome/browser/sync/glue/typed_url_change_processor.cc +++ b/chrome/browser/sync/glue/typed_url_change_processor.cc @@ -4,8 +4,8 @@ #include "chrome/browser/sync/glue/typed_url_change_processor.h" +#include "base/location.h" #include "base/string_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/sync/glue/typed_url_model_associator.cc b/chrome/browser/sync/glue/typed_url_model_associator.cc index cdfd779..2b55709 100644 --- a/chrome/browser/sync/glue/typed_url_model_associator.cc +++ b/chrome/browser/sync/glue/typed_url_model_associator.cc @@ -7,8 +7,8 @@ #include <algorithm> #include <set> +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/sync/api/sync_error.h" diff --git a/chrome/browser/sync/internal_api/syncapi_unittest.cc b/chrome/browser/sync/internal_api/syncapi_unittest.cc index 529867e..7295966 100644 --- a/chrome/browser/sync/internal_api/syncapi_unittest.cc +++ b/chrome/browser/sync/internal_api/syncapi_unittest.cc @@ -12,12 +12,12 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/format_macros.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/password_manager/encryptor.h" diff --git a/chrome/browser/sync/js/js_sync_manager_observer.cc b/chrome/browser/sync/js/js_sync_manager_observer.cc index 71fc1fbb..34eb060 100644 --- a/chrome/browser/sync/js/js_sync_manager_observer.cc +++ b/chrome/browser/sync/js/js_sync_manager_observer.cc @@ -6,8 +6,8 @@ #include <cstddef> +#include "base/location.h" #include "base/logging.h" -#include "base/tracked.h" #include "base/values.h" #include "chrome/browser/sync/internal_api/change_record.h" #include "chrome/browser/sync/js/js_arg_list.h" diff --git a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc index 4073a28..c1c80d9 100644 --- a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc +++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc @@ -7,8 +7,8 @@ #include <cstddef> #include "base/basictypes.h" +#include "base/location.h" #include "base/message_loop.h" -#include "base/tracked.h" #include "base/values.h" #include "chrome/browser/sync/internal_api/read_node.h" #include "chrome/browser/sync/internal_api/read_transaction.h" diff --git a/chrome/browser/sync/js/js_transaction_observer.cc b/chrome/browser/sync/js/js_transaction_observer.cc index c0d5b62..1cda1a0 100644 --- a/chrome/browser/sync/js/js_transaction_observer.cc +++ b/chrome/browser/sync/js/js_transaction_observer.cc @@ -6,9 +6,9 @@ #include <string> +#include "base/location.h" #include "base/logging.h" #include "base/string_number_conversions.h" -#include "base/tracked.h" #include "base/values.h" #include "chrome/browser/sync/js/js_event_details.h" #include "chrome/browser/sync/js/js_event_handler.h" diff --git a/chrome/browser/sync/profile_sync_service.h b/chrome/browser/sync/profile_sync_service.h index 318f459..f0ac2c9 100644 --- a/chrome/browser/sync/profile_sync_service.h +++ b/chrome/browser/sync/profile_sync_service.h @@ -11,6 +11,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" #include "base/gtest_prod_util.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/memory/weak_ptr.h" #include "base/observer_list.h" @@ -18,7 +19,6 @@ #include "base/task.h" #include "base/time.h" #include "base/timer.h" -#include "base/tracked.h" #include "chrome/browser/prefs/pref_member.h" #include "chrome/browser/sync/engine/model_safe_worker.h" #include "chrome/browser/sync/glue/data_type_controller.h" diff --git a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc index c886e47..3f6a175 100644 --- a/chrome/browser/sync/profile_sync_service_autofill_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_autofill_unittest.cc @@ -9,6 +9,7 @@ #include "testing/gtest/include/gtest/gtest.h" #include "base/callback.h" +#include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" @@ -16,7 +17,6 @@ #include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/time.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autofill/autofill_common_test.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc index 9fe877c..1faafef 100644 --- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc @@ -12,12 +12,12 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/string16.h" #include "base/string_number_conversions.h" #include "base/string_util.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/bookmarks/bookmark_model.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index ba88bed..1caa66d 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -15,11 +15,11 @@ #include "base/base64.h" #include "base/compiler_specific.h" #include "base/json/json_writer.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/task.h" -#include "base/tracked.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sync/sessions/session_state.h" #include "chrome/browser/sync/signin_manager.h" diff --git a/chrome/browser/sync/profile_sync_service_password_unittest.cc b/chrome/browser/sync/profile_sync_service_password_unittest.cc index 241fd9e..16e1a2f 100644 --- a/chrome/browser/sync/profile_sync_service_password_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_password_unittest.cc @@ -6,11 +6,11 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "base/location.h" #include "base/synchronization/waitable_event.h" #include "base/task.h" #include "base/test/test_timeouts.h" #include "base/time.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/password_manager/password_store.h" #include "chrome/browser/prefs/pref_service.h" diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc index bd9558b..6f0decc 100644 --- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc @@ -6,10 +6,10 @@ #include <string> #include "base/json/json_reader.h" +#include "base/location.h" #include "base/stl_util.h" #include "base/string_piece.h" #include "base/task.h" -#include "base/tracked.h" #include "chrome/browser/prefs/pref_model_associator.h" #include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/sync/abstract_profile_sync_service_test.h" diff --git a/chrome/browser/sync/profile_sync_service_session_unittest.cc b/chrome/browser/sync/profile_sync_service_session_unittest.cc index fd28aa3..6200948 100644 --- a/chrome/browser/sync/profile_sync_service_session_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_session_unittest.cc @@ -5,12 +5,12 @@ #include <map> #include <string> +#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/task.h" -#include "base/tracked.h" #include "chrome/browser/sessions/session_service_factory.h" #include "chrome/browser/sessions/session_service.h" #include "chrome/browser/sessions/session_service_test_helper.h" diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc index d99fe0e..26d05f4 100644 --- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc +++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc @@ -6,11 +6,11 @@ #include "testing/gtest/include/gtest/gtest.h" +#include "base/location.h" #include "base/memory/ref_counted.h" #include "base/string16.h" #include "base/threading/thread.h" #include "base/time.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "chrome/browser/history/history_backend.h" #include "chrome/browser/history/history_notifications.h" diff --git a/chrome/browser/sync/sessions/sync_session_unittest.cc b/chrome/browser/sync/sessions/sync_session_unittest.cc index 34c91de..e80fb21 100644 --- a/chrome/browser/sync/sessions/sync_session_unittest.cc +++ b/chrome/browser/sync/sessions/sync_session_unittest.cc @@ -5,8 +5,8 @@ #include "chrome/browser/sync/sessions/sync_session.h" #include "base/compiler_specific.h" +#include "base/location.h" #include "base/memory/ref_counted.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/conflict_resolver.h" #include "chrome/browser/sync/engine/mock_model_safe_workers.h" #include "chrome/browser/sync/engine/syncer_types.h" diff --git a/chrome/browser/sync/sync_js_controller.cc b/chrome/browser/sync/sync_js_controller.cc index 4843060..3f45b4e1 100644 --- a/chrome/browser/sync/sync_js_controller.cc +++ b/chrome/browser/sync/sync_js_controller.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/sync_js_controller.h" -#include "base/tracked.h" +#include "base/location.h" #include "chrome/browser/sync/js/js_backend.h" #include "chrome/browser/sync/js/js_event_details.h" diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc index a279e51..d28ef59 100644 --- a/chrome/browser/sync/syncable/syncable.cc +++ b/chrome/browser/sync/syncable/syncable.cc @@ -30,6 +30,7 @@ #include "base/compiler_specific.h" #include "base/file_util.h" #include "base/hash_tables.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/perftimer.h" @@ -37,7 +38,6 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/time.h" -#include "base/tracked.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/sync/protocol/proto_value_conversions.h" diff --git a/chrome/browser/sync/syncable/syncable.h b/chrome/browser/sync/syncable/syncable.h index e0fbe1d..bebf9a9 100644 --- a/chrome/browser/sync/syncable/syncable.h +++ b/chrome/browser/sync/syncable/syncable.h @@ -19,12 +19,12 @@ #include "base/basictypes.h" #include "base/file_path.h" #include "base/gtest_prod_util.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/observer_list_threadsafe.h" #include "base/synchronization/lock.h" #include "base/time.h" -#include "base/tracked.h" #include "chrome/browser/sync/protocol/sync.pb.h" #include "chrome/browser/sync/syncable/blob.h" #include "chrome/browser/sync/syncable/dir_open_result.h" diff --git a/chrome/browser/sync/syncable/syncable_mock.cc b/chrome/browser/sync/syncable/syncable_mock.cc index da5e891..701c7bf 100644 --- a/chrome/browser/sync/syncable/syncable_mock.cc +++ b/chrome/browser/sync/syncable/syncable_mock.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/syncable/syncable_mock.h" -#include "base/tracked.h" +#include "base/location.h" MockDirectory::MockDirectory() { InitKernel("myk", &delegate_); diff --git a/chrome/browser/sync/syncable/syncable_unittest.cc b/chrome/browser/sync/syncable/syncable_unittest.cc index 004e739..c79442c 100644 --- a/chrome/browser/sync/syncable/syncable_unittest.cc +++ b/chrome/browser/sync/syncable/syncable_unittest.cc @@ -23,13 +23,13 @@ #include "base/compiler_specific.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/synchronization/condition_variable.h" #include "base/threading/platform_thread.h" -#include "base/tracked.h" #include "base/values.h" #include "chrome/browser/sync/engine/syncproto.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" diff --git a/chrome/browser/sync/test/engine/mock_connection_manager.cc b/chrome/browser/sync/test/engine/mock_connection_manager.cc index 22e11c0..f2e96c0 100644 --- a/chrome/browser/sync/test/engine/mock_connection_manager.cc +++ b/chrome/browser/sync/test/engine/mock_connection_manager.cc @@ -8,8 +8,8 @@ #include <map> +#include "base/location.h" #include "base/stringprintf.h" -#include "base/tracked.h" #include "chrome/browser/sync/engine/syncer_proto_util.h" #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" #include "chrome/browser/sync/test/engine/test_id_factory.h" diff --git a/chrome/browser/sync/test/engine/test_directory_setter_upper.cc b/chrome/browser/sync/test/engine/test_directory_setter_upper.cc index 44eeb19..4123540 100644 --- a/chrome/browser/sync/test/engine/test_directory_setter_upper.cc +++ b/chrome/browser/sync/test/engine/test_directory_setter_upper.cc @@ -6,8 +6,8 @@ #include "base/compiler_specific.h" #include "base/file_util.h" +#include "base/location.h" #include "base/string_util.h" -#include "base/tracked.h" #include "chrome/browser/sync/syncable/directory_manager.h" #include "chrome/browser/sync/syncable/syncable.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/sync/unrecoverable_error_handler.h b/chrome/browser/sync/unrecoverable_error_handler.h index c8471ef..6274279 100644 --- a/chrome/browser/sync/unrecoverable_error_handler.h +++ b/chrome/browser/sync/unrecoverable_error_handler.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 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. @@ -8,7 +8,7 @@ #include <string> -#include "base/tracked.h" +#include "base/location.h" namespace browser_sync { diff --git a/chrome/browser/sync/util/logging.cc b/chrome/browser/sync/util/logging.cc index 2951f8c..9601f58 100644 --- a/chrome/browser/sync/util/logging.cc +++ b/chrome/browser/sync/util/logging.cc @@ -4,7 +4,7 @@ #include "chrome/browser/sync/util/logging.h" -#include "base/tracked.h" +#include "base/location.h" namespace browser_sync { diff --git a/chrome/browser/sync/util/weak_handle.cc b/chrome/browser/sync/util/weak_handle.cc index 71acad6..5246fa7 100644 --- a/chrome/browser/sync/util/weak_handle.cc +++ b/chrome/browser/sync/util/weak_handle.cc @@ -6,8 +6,8 @@ #include <sstream> +#include "base/location.h" #include "base/message_loop_proxy.h" -#include "base/tracked.h" namespace browser_sync { diff --git a/chrome/browser/sync/util/weak_handle.h b/chrome/browser/sync/util/weak_handle.h index 39be3e8..2ce3d80 100644 --- a/chrome/browser/sync/util/weak_handle.h +++ b/chrome/browser/sync/util/weak_handle.h @@ -54,6 +54,7 @@ #include "base/bind.h" #include "base/callback.h" #include "base/compiler_specific.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/weak_ptr.h" diff --git a/chrome/browser/sync/util/weak_handle_unittest.cc b/chrome/browser/sync/util/weak_handle_unittest.cc index 107f2da..e23b71e 100644 --- a/chrome/browser/sync/util/weak_handle_unittest.cc +++ b/chrome/browser/sync/util/weak_handle_unittest.cc @@ -6,10 +6,10 @@ #include "base/bind.h" #include "base/compiler_specific.h" +#include "base/location.h" #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/threading/thread.h" -#include "base/tracked.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/profile_import/profile_import_thread.cc b/chrome/profile_import/profile_import_thread.cc index d98a2b0..5a211fb 100644 --- a/chrome/profile_import/profile_import_thread.cc +++ b/chrome/profile_import/profile_import_thread.cc @@ -7,6 +7,7 @@ #include <stddef.h> #include <algorithm> +#include "base/location.h" #include "base/message_loop.h" #include "base/threading/thread.h" #include "base/values.h" |