summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:29:22 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-11 07:29:22 +0000
commitf439096d4336df79adad9c69d30a95ce705a05e5 (patch)
tree87d44c8f8324cbcf9025150f5cb52018c9de0631 /extensions
parent95f2d204098eb38e086500f1707f20ae2e5b4ef6 (diff)
downloadchromium_src-f439096d4336df79adad9c69d30a95ce705a05e5.zip
chromium_src-f439096d4336df79adad9c69d30a95ce705a05e5.tar.gz
chromium_src-f439096d4336df79adad9c69d30a95ce705a05e5.tar.bz2
Use a direct include of strings headers in extensions/, google_apis/, gpu/.
BUG=247723 TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16632010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205460 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'extensions')
-rw-r--r--extensions/common/error_utils.cc2
-rw-r--r--extensions/common/error_utils.h2
-rw-r--r--extensions/common/id_util.cc4
-rw-r--r--extensions/common/matcher/regex_set_matcher.cc2
-rw-r--r--extensions/common/matcher/url_matcher_factory.cc2
-rw-r--r--extensions/common/matcher/url_matcher_factory_unittest.cc2
-rw-r--r--extensions/common/matcher/url_matcher_unittest.cc2
-rw-r--r--extensions/common/url_pattern.cc4
8 files changed, 10 insertions, 10 deletions
diff --git a/extensions/common/error_utils.cc b/extensions/common/error_utils.cc
index 996e7c9..bd4d32e 100644
--- a/extensions/common/error_utils.cc
+++ b/extensions/common/error_utils.cc
@@ -4,7 +4,7 @@
#include "extensions/common/error_utils.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "base/strings/utf_string_conversions.h"
namespace extensions {
diff --git a/extensions/common/error_utils.h b/extensions/common/error_utils.h
index f63f4da..c4d012a 100644
--- a/extensions/common/error_utils.h
+++ b/extensions/common/error_utils.h
@@ -7,7 +7,7 @@
#include <string>
-#include "base/string16.h"
+#include "base/strings/string16.h"
namespace extensions {
diff --git a/extensions/common/id_util.cc b/extensions/common/id_util.cc
index 5bdeba4..3b8628e 100644
--- a/extensions/common/id_util.cc
+++ b/extensions/common/id_util.cc
@@ -5,8 +5,8 @@
#include "extensions/common/id_util.h"
#include "base/files/file_path.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/strings/string_util.h"
#include "crypto/sha2.h"
namespace {
diff --git a/extensions/common/matcher/regex_set_matcher.cc b/extensions/common/matcher/regex_set_matcher.cc
index 3052a63..af8027c 100644
--- a/extensions/common/matcher/regex_set_matcher.cc
+++ b/extensions/common/matcher/regex_set_matcher.cc
@@ -6,7 +6,7 @@
#include "base/logging.h"
#include "base/stl_util.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "extensions/common/matcher/substring_set_matcher.h"
#include "third_party/re2/re2/filtered_re2.h"
#include "third_party/re2/re2/re2.h"
diff --git a/extensions/common/matcher/url_matcher_factory.cc b/extensions/common/matcher/url_matcher_factory.cc
index d35d032..eb1548c 100644
--- a/extensions/common/matcher/url_matcher_factory.cc
+++ b/extensions/common/matcher/url_matcher_factory.cc
@@ -9,7 +9,7 @@
#include "base/lazy_instance.h"
#include "base/logging.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "extensions/common/error_utils.h"
#include "extensions/common/matcher/url_matcher_constants.h"
diff --git a/extensions/common/matcher/url_matcher_factory_unittest.cc b/extensions/common/matcher/url_matcher_factory_unittest.cc
index 1335726..0b4def3 100644
--- a/extensions/common/matcher/url_matcher_factory_unittest.cc
+++ b/extensions/common/matcher/url_matcher_factory_unittest.cc
@@ -6,7 +6,7 @@
#include "base/basictypes.h"
#include "base/format_macros.h"
-#include "base/stringprintf.h"
+#include "base/strings/stringprintf.h"
#include "base/values.h"
#include "extensions/common/matcher/url_matcher_constants.h"
#include "googleurl/src/gurl.h"
diff --git a/extensions/common/matcher/url_matcher_unittest.cc b/extensions/common/matcher/url_matcher_unittest.cc
index 7ccc058..15a41a1 100644
--- a/extensions/common/matcher/url_matcher_unittest.cc
+++ b/extensions/common/matcher/url_matcher_unittest.cc
@@ -4,7 +4,7 @@
#include "extensions/common/matcher/url_matcher.h"
-#include "base/string_util.h"
+#include "base/strings/string_util.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/extensions/common/url_pattern.cc b/extensions/common/url_pattern.cc
index 17983dc..fe1f269 100644
--- a/extensions/common/url_pattern.cc
+++ b/extensions/common/url_pattern.cc
@@ -4,10 +4,10 @@
#include "extensions/common/url_pattern.h"
-#include "base/string_number_conversions.h"
-#include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
#include "base/strings/string_piece.h"
#include "base/strings/string_split.h"
+#include "base/strings/string_util.h"
#include "content/public/common/url_constants.h"
#include "extensions/common/constants.h"
#include "googleurl/src/gurl.h"