summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 06:32:18 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 06:32:18 +0000
commit4aa794a1fee9d6939225363c3713be22029c7148 (patch)
tree01bc06b06640129a2c1200d4ac2211e4b0f54796 /jingle
parent348fbaac3221020d0087ab1cc24dc4ba045ea219 (diff)
downloadchromium_src-4aa794a1fee9d6939225363c3713be22029c7148.zip
chromium_src-4aa794a1fee9d6939225363c3713be22029c7148.tar.gz
chromium_src-4aa794a1fee9d6939225363c3713be22029c7148.tar.bz2
Use a direct include of strings headers in ipc/, jingle/, media/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16684003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205436 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'jingle')
-rw-r--r--jingle/notifier/communicator/single_login_attempt.cc2
-rw-r--r--jingle/notifier/listener/notification_defines.cc2
-rw-r--r--jingle/notifier/listener/notification_defines_unittest.cc2
-rw-r--r--jingle/notifier/listener/push_notifications_send_update_task_unittest.cc2
-rw-r--r--jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc2
-rw-r--r--jingle/notifier/listener/xml_element_util.cc2
6 files changed, 6 insertions, 6 deletions
diff --git a/jingle/notifier/communicator/single_login_attempt.cc b/jingle/notifier/communicator/single_login_attempt.cc
index 49fcdee..67268c3 100644
--- a/jingle/notifier/communicator/single_login_attempt.cc
+++ b/jingle/notifier/communicator/single_login_attempt.cc
@@ -8,7 +8,7 @@
#include "base/basictypes.h"
#include "base/logging.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
#include "jingle/notifier/base/const_communicator.h"
#include "jingle/notifier/base/gaia_token_pre_xmpp_auth.h"
diff --git a/jingle/notifier/listener/notification_defines.cc b/jingle/notifier/listener/notification_defines.cc
index 7431ea2..f4f3e40 100644
--- a/jingle/notifier/listener/notification_defines.cc
+++ b/jingle/notifier/listener/notification_defines.cc
@@ -8,7 +8,7 @@
#include "base/json/string_escape.h"
#include "base/logging.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/values.h"
namespace notifier {
diff --git a/jingle/notifier/listener/notification_defines_unittest.cc b/jingle/notifier/listener/notification_defines_unittest.cc
index 85dd889..389f3cc 100644
--- a/jingle/notifier/listener/notification_defines_unittest.cc
+++ b/jingle/notifier/listener/notification_defines_unittest.cc
@@ -4,7 +4,7 @@
#include <string>
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "jingle/notifier/listener/notification_defines.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
index 3fa424ee..c57bd93 100644
--- a/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
+++ b/jingle/notifier/listener/push_notifications_send_update_task_unittest.cc
@@ -6,7 +6,7 @@
#include "base/base64.h"
#include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "talk/xmpp/jid.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
index 8c177c9..32522f2 100644
--- a/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
+++ b/jingle/notifier/listener/push_notifications_subscribe_task_unittest.cc
@@ -5,7 +5,7 @@
#include "jingle/notifier/listener/push_notifications_subscribe_task.h"
#include "base/memory/scoped_ptr.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "jingle/notifier/listener/xml_element_util.h"
#include "talk/xmpp/jid.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/jingle/notifier/listener/xml_element_util.cc b/jingle/notifier/listener/xml_element_util.cc
index 653b769..7419a1e 100644
--- a/jingle/notifier/listener/xml_element_util.cc
+++ b/jingle/notifier/listener/xml_element_util.cc
@@ -7,7 +7,7 @@
#include <sstream>
#include <string>
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "talk/xmllite/qname.h"
#include "talk/xmllite/xmlconstants.h"
#include "talk/xmllite/xmlelement.h"