0

Use a direct include of strings headers in rlz/, sandbox/, skia/, sql/, sync/.

BUG=247723
TEST=none
TBR=ben@chromium.org

Review URL: https://chromiumcodereview.appspot.com/16358024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205458 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
avi@chromium.org
2013-06-11 07:28:19 +00:00
parent 0d8db08c32
commit a4bbc1f9b8
75 changed files with 86 additions and 87 deletions
rlz
sandbox
skia/ext
sql
sync

@ -10,7 +10,7 @@
#include "base/json/json_string_value_serializer.h"
#include "base/logging.h"
#include "base/sequenced_task_runner.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/recursive_cross_process_lock_posix.h"

@ -8,8 +8,8 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"

@ -18,8 +18,8 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "rlz/lib/lib_values.h"
#include "rlz/lib/machine_id.h"

@ -6,7 +6,7 @@
#include "rlz/lib/lib_values.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "rlz/lib/assert.h"
namespace rlz_lib {

@ -5,7 +5,7 @@
#ifndef RLZ_LIB_MACHINE_ID_H_
#define RLZ_LIB_MACHINE_ID_H_
#include "base/string16.h"
#include "base/strings/string16.h"
#include <string>

@ -4,7 +4,7 @@
#include "rlz/lib/machine_id.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/strings/utf_string_conversions.h"
#include "rlz/test/rlz_test_helpers.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -7,8 +7,8 @@
#include "rlz/lib/rlz_lib.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/crc32.h"
#include "rlz/lib/financial_ping.h"

@ -12,8 +12,8 @@
#include "base/mac/foundation_util.h"
#include "base/mac/scoped_cftyperef.h"
#include "base/mac/scoped_ioobject.h"
#include "base/string16.h"
#include "base/stringprintf.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
#include "base/strings/sys_string_conversions.h"
#include "base/strings/utf_string_conversions.h"

@ -11,9 +11,9 @@
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/win/registry.h"
#include "rlz/lib/assert.h"
#include "rlz/lib/lib_values.h"

@ -7,7 +7,7 @@
#include <string>
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "rlz/lib/assert.h"
namespace rlz_lib {

@ -4,7 +4,7 @@
#include "rlz/win/lib/rlz_value_store_registry.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/win/registry.h"
#include "rlz/lib/assert.h"

@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/posix/eintr_wrapper.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sandbox/linux/suid/common/sandbox.h"
#include "sandbox/linux/suid/common/suid_unsafe_environment_variables.h"

@ -5,7 +5,7 @@
#include "base/environment.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "sandbox/linux/suid/common/sandbox.h"

@ -10,7 +10,7 @@
#include <vector>
#include "base/memory/scoped_ptr.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sandbox/win/src/sandbox_types.h"
namespace base {

@ -8,7 +8,7 @@
#include <atlbase.h>
#include <atlsecurity.h>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"
#include "sandbox/win/src/sync_policy_test.h"

@ -9,7 +9,7 @@
#include <set>
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sandbox/win/src/interception.h"
#include "sandbox/win/src/sandbox_types.h"
#include "sandbox/win/src/target_process.h"

@ -6,7 +6,7 @@
#define SANDBOX_SRC_HANDLE_CLOSER_AGENT_H_
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sandbox/win/src/handle_closer.h"
#include "sandbox/win/src/sandbox_types.h"

@ -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/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/win/scoped_handle.h"
#include "sandbox/win/src/handle_closer_agent.h"
#include "sandbox/win/src/sandbox.h"

@ -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/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "sandbox/win/src/handle_policy.h"
#include "sandbox/win/src/nt_internals.h"
#include "sandbox/win/src/sandbox.h"

@ -9,7 +9,7 @@
#include <vector>
#include "base/basictypes.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sandbox/win/src/nt_internals.h"
namespace sandbox {

@ -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/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/win/scoped_handle.h"
#include "base/win/windows_version.h"

@ -5,7 +5,7 @@
#include <memory>
#include <string>
#include "base/string16.h"
#include "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
#include "base/win/scoped_handle.h"
#include "base/win/scoped_process_information.h"

@ -12,7 +12,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sandbox/win/src/crosscall_server.h"
#include "sandbox/win/src/handle_closer.h"
#include "sandbox/win/src/ipc_tags.h"

@ -17,7 +17,7 @@
namespace {
// Grabbed from base/string_util.h
// Grabbed from base/strings/string_util.h
template <class string_type>
inline typename string_type::value_type* WriteInto(string_type* str,
size_t length_with_null) {

@ -7,7 +7,7 @@
// that provides integration with the logging of your choice.
#include "base/logging.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "third_party/skia/include/core/SkTypes.h"
void SkDebugf_FileLine(const char* file, int line, bool fatal,

@ -19,9 +19,9 @@
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/format_macros.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/time.h"
#include "skia/ext/image_operations.h"

@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "skia/ext/image_operations.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"

@ -11,8 +11,8 @@
#include "base/command_line.h"
#include "base/file_util.h"
#include "base/path_service.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "skia/ext/vector_canvas.h"
#include "skia/ext/vector_platform_device_emf_win.h"

@ -7,7 +7,7 @@
#include <windows.h>
#include "base/logging.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "skia/ext/bitmap_platform_device.h"
#include "skia/ext/skia_utils_win.h"
#include "third_party/skia/include/core/SkFontHost.h"

@ -11,9 +11,9 @@
#include "base/logging.h"
#include "base/metrics/histogram.h"
#include "base/metrics/sparse_histogram.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "sql/statement.h"
#include "third_party/sqlite/sqlite3.h"

@ -5,7 +5,7 @@
#include "sql/meta_table.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "sql/connection.h"
#include "sql/statement.h"
#include "sql/transaction.h"

@ -5,7 +5,7 @@
#include "sql/statement.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "third_party/sqlite/sqlite3.h"

@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "base/string16.h"
#include "base/strings/string16.h"
#include "sql/connection.h"
#include "sql/sql_export.h"

@ -8,7 +8,7 @@
#include "base/json/json_writer.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/base_node.h"

@ -5,7 +5,7 @@
#include "base/format_macros.h"
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "sync/engine/apply_control_data_updates.h"
#include "sync/engine/syncer.h"
#include "sync/engine/syncer_util.h"

@ -6,7 +6,7 @@
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "sync/engine/apply_updates_and_resolve_conflicts_command.h"
#include "sync/engine/syncer.h"
#include "sync/internal_api/public/test/test_entry_factory.h"

@ -9,7 +9,7 @@
#include <string>
#include <vector>
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "sync/engine/syncer_proto_util.h"
#include "sync/internal_api/public/base/unique_position.h"
#include "sync/protocol/bookmark_specifics.pb.h"

@ -11,7 +11,7 @@
#include "base/atomicops.h"
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/synchronization/lock.h"
#include "base/threading/non_thread_safe.h"
#include "base/threading/thread_checker.h"

@ -7,7 +7,7 @@
#include <vector>
#include "base/location.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "sync/internal_api/public/test/test_entry_factory.h"
#include "sync/protocol/bookmark_specifics.pb.h"
#include "sync/protocol/sync.pb.h"

@ -5,7 +5,7 @@
#include "sync/engine/syncer_proto_util.h"
#include "base/format_macros.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "google_apis/google_api_keys.h"
#include "sync/engine/net/server_connection_manager.h"
#include "sync/engine/syncer.h"

@ -19,8 +19,8 @@
#include "base/location.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/time.h"
#include "build/build_config.h"
#include "sync/engine/get_commit_ids_command.h"

@ -12,7 +12,7 @@
#include "base/base64.h"
#include "base/location.h"
#include "base/metrics/histogram.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/engine/conflict_resolver.h"
#include "sync/engine/syncer_proto_util.h"
#include "sync/engine/syncer_types.h"

@ -6,7 +6,7 @@
#include <stack>
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base_transaction.h"

@ -4,7 +4,7 @@
#include "sync/internal_api/public/change_record.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base_node.h"
#include "sync/internal_api/public/read_node.h"

@ -6,7 +6,7 @@
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "net/base/load_flags.h"
#include "net/base/net_errors.h"
#include "net/cookies/cookie_monster.h"

@ -8,7 +8,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/js/js_event_details.h"
#include "sync/js/js_event_handler.h"

@ -8,7 +8,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/util/sync_string_conversions.h"

@ -8,7 +8,7 @@
#include "base/location.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base/model_type.h"
#include "sync/internal_api/public/change_record.h"

@ -6,7 +6,7 @@
#include <cstddef>
#include "base/rand_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
namespace syncer {

@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/protocol/unique_position.pb.h"
#include "third_party/zlib/zlib.h"

@ -11,7 +11,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/sha1.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/protocol/unique_position.pb.h"
#include "testing/gtest/include/gtest/gtest.h"

@ -5,7 +5,7 @@
#include "sync/internal_api/public/change_record.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/values_test_util.h"
#include "base/values.h"
#include "sync/protocol/extension_specifics.pb.h"

@ -15,7 +15,7 @@
#include "base/memory/ref_counted.h"
#include "base/metrics/histogram.h"
#include "base/observer_list.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/engine/sync_scheduler.h"
#include "sync/engine/syncer_types.h"

@ -18,8 +18,8 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/message_loop/message_loop_proxy.h"
#include "base/string_number_conversions.h"
#include "base/stringprintf.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
#include "base/test/values_test_util.h"
#include "base/values.h"

@ -4,7 +4,7 @@
#include "sync/internal_api/public/write_node.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base_transaction.h"

@ -12,8 +12,8 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
#include "base/strings/string_util.h"
#include "base/strings/stringprintf.h"
#include "google/cacheinvalidation/deps/callback.h"
#include "google/cacheinvalidation/include/types.h"
#include "jingle/notifier/listener/push_client.h"

@ -9,7 +9,7 @@
#include "base/base64.h"
#include "base/basictypes.h"
#include "base/logging.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "sync/internal_api/public/base/unique_position.h"
#include "sync/protocol/app_notification_specifics.pb.h"

@ -7,7 +7,7 @@
#include "sync/protocol/proto_value_conversions.h"
#include "base/memory/scoped_ptr.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/time.h"
#include "base/values.h"
#include "sync/internal_api/public/base/model_type.h"

@ -7,7 +7,7 @@
#include "base/base64.h"
#include "base/debug/trace_event.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/internal_api/public/base/unique_position.h"
#include "sync/internal_api/public/util/unrecoverable_error_handler.h"
#include "sync/syncable/entry.h"

@ -12,7 +12,7 @@
#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/rand_util.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/time.h"
#include "sql/connection.h"
#include "sql/statement.h"

@ -11,7 +11,7 @@
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sql/connection.h"
#include "sql/statement.h"
#include "sync/base/sync_export.h"

@ -7,7 +7,7 @@
#include <iomanip>
#include "base/json/string_escape.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "sync/syncable/blob.h"
#include "sync/syncable/directory.h"
#include "sync/syncable/syncable_base_transaction.h"

@ -4,7 +4,7 @@
#include "sync/syncable/entry_kernel.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/protocol/proto_value_conversions.h"
#include "sync/syncable/syncable_enum_conversions.h"
#include "sync/util/cryptographer.h"

@ -14,7 +14,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
#include "base/stl_util.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/synchronization/condition_variable.h"
#include "base/test/values_test_util.h"
#include "base/threading/platform_thread.h"

@ -4,7 +4,7 @@
#include "sync/syncable/write_transaction_info.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
namespace syncer {
namespace syncable {

@ -12,7 +12,7 @@
#include "base/json/json_writer.h"
#include "base/message_loop.h"
#include "base/run_loop.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "base/time.h"
#include "base/values.h"
#include "net/base/url_util.h"

@ -9,9 +9,8 @@
#include <map>
#include "base/location.h"
#include "base/stringprintf.h"
#include "base/strings/stringprintf.h"
#include "sync/engine/syncer_proto_util.h"
#include "sync/test/engine/test_id_factory.h"
#include "sync/protocol/bookmark_specifics.pb.h"
#include "sync/syncable/directory.h"
#include "sync/syncable/syncable_write_transaction.h"

@ -7,7 +7,7 @@
#include "base/compiler_specific.h"
#include "base/file_util.h"
#include "base/location.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "sync/syncable/directory.h"
#include "sync/syncable/in_memory_directory_backing_store.h"
#include "sync/syncable/mutable_entry.h"

@ -9,7 +9,7 @@
#include <string>
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "sync/syncable/syncable_id.h"
namespace syncer {

@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/path_service.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/values.h"
#include "net/test/python_utils.h"
#include "net/test/spawned_test_server/spawned_test_server.h"

@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/message_loop.h"
#include "base/process_util.h"
#include "base/string_number_conversions.h"
#include "base/strings/string_number_conversions.h"
#include "base/test/test_timeouts.h"
#include "net/test/python_utils.h"
#include "sync/test/local_sync_test_server.h"

@ -7,7 +7,7 @@
#include <string>
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "sync/protocol/password_specifics.pb.h"
#include "sync/test/fake_encryptor.h"
#include "testing/gmock/include/gmock/gmock.h"

@ -8,7 +8,7 @@
#include <sys/sysctl.h>
#include "base/mac/scoped_cftyperef.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/strings/sys_string_conversions.h"
namespace syncer {

@ -9,7 +9,7 @@
#include "base/base64.h"
#include "base/logging.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "base/sys_byteorder.h"
#include "crypto/encryptor.h"
#include "crypto/hmac.h"

@ -7,7 +7,7 @@
#include <string>
#include "base/memory/scoped_ptr.h"
#include "base/string_util.h"
#include "base/strings/string_util.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace syncer {