summaryrefslogtreecommitdiffstats
path: root/sync/engine
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:28:19 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:28:19 +0000
commita4bbc1f9b821dee29561beb13bc8d42eadfb0f6a (patch)
treef88ce6b64021181379d4627c2c666dbd46286314 /sync/engine
parent0d8db08c32735b1fd916495227802d933b308991 (diff)
downloadchromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.zip
chromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.tar.gz
chromium_src-a4bbc1f9b821dee29561beb13bc8d42eadfb0f6a.tar.bz2
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
Diffstat (limited to 'sync/engine')
-rw-r--r--sync/engine/apply_control_data_updates_unittest.cc2
-rw-r--r--sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc2
-rw-r--r--sync/engine/build_commit_command.cc2
-rw-r--r--sync/engine/net/server_connection_manager.h2
-rw-r--r--sync/engine/process_commit_response_command_unittest.cc2
-rw-r--r--sync/engine/syncer_proto_util.cc2
-rw-r--r--sync/engine/syncer_unittest.cc4
-rw-r--r--sync/engine/syncer_util.cc2
8 files changed, 9 insertions, 9 deletions
diff --git a/sync/engine/apply_control_data_updates_unittest.cc b/sync/engine/apply_control_data_updates_unittest.cc
index d51ee25..2dca863 100644
--- a/sync/engine/apply_control_data_updates_unittest.cc
+++ b/sync/engine/apply_control_data_updates_unittest.cc
@@ -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"
diff --git a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc
index c341e8f..6a0db18 100644
--- a/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc
+++ b/sync/engine/apply_updates_and_resolve_conflicts_command_unittest.cc
@@ -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"
diff --git a/sync/engine/build_commit_command.cc b/sync/engine/build_commit_command.cc
index 71a67f2..0f16b80 100644
--- a/sync/engine/build_commit_command.cc
+++ b/sync/engine/build_commit_command.cc
@@ -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"
diff --git a/sync/engine/net/server_connection_manager.h b/sync/engine/net/server_connection_manager.h
index df81e265..f46ee89 100644
--- a/sync/engine/net/server_connection_manager.h
+++ b/sync/engine/net/server_connection_manager.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"
diff --git a/sync/engine/process_commit_response_command_unittest.cc b/sync/engine/process_commit_response_command_unittest.cc
index 0d25c01..1520ca2 100644
--- a/sync/engine/process_commit_response_command_unittest.cc
+++ b/sync/engine/process_commit_response_command_unittest.cc
@@ -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"
diff --git a/sync/engine/syncer_proto_util.cc b/sync/engine/syncer_proto_util.cc
index e2114f9..41054a3 100644
--- a/sync/engine/syncer_proto_util.cc
+++ b/sync/engine/syncer_proto_util.cc
@@ -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"
diff --git a/sync/engine/syncer_unittest.cc b/sync/engine/syncer_unittest.cc
index 71eef90..1b62696 100644
--- a/sync/engine/syncer_unittest.cc
+++ b/sync/engine/syncer_unittest.cc
@@ -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"
diff --git a/sync/engine/syncer_util.cc b/sync/engine/syncer_util.cc
index 93f2bef..d2992a6 100644
--- a/sync/engine/syncer_util.cc
+++ b/sync/engine/syncer_util.cc
@@ -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"