summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:27:48 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-13 19:27:48 +0000
commitb9f9383602610ef1f94e9bee2d91d7c044e16051 (patch)
tree8f16f6ff2f2b40bd69cae63fb6ae517ad9d0e35b /net
parent7bc3ca67f1395c1744cb09ac50ff9ddf92f66ab7 (diff)
downloadchromium_src-b9f9383602610ef1f94e9bee2d91d7c044e16051.zip
chromium_src-b9f9383602610ef1f94e9bee2d91d7c044e16051.tar.gz
chromium_src-b9f9383602610ef1f94e9bee2d91d7c044e16051.tar.bz2
Split *AndAdjustOffset() functions into their own header, to restore utf_string_conversions.h to a simple, readable state.
BUG=4010 TEST=none Review URL: http://codereview.chromium.org/387012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/escape.cc4
-rw-r--r--net/base/net_util.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/net/base/escape.cc b/net/base/escape.cc
index 0327fc2..6963967 100644
--- a/net/base/escape.cc
+++ b/net/base/escape.cc
@@ -8,7 +8,9 @@
#include "base/i18n/icu_string_conversions.h"
#include "base/logging.h"
-#include "base/string_util.h"
+#include "base/string_piece.h"
+#include "base/utf_string_conversions.h"
+#include "base/utf_offset_string_conversions.h"
namespace {
diff --git a/net/base/net_util.cc b/net/base/net_util.cc
index 309fda7..af090bd 100644
--- a/net/base/net_util.cc
+++ b/net/base/net_util.cc
@@ -44,7 +44,7 @@
#include "base/string_util.h"
#include "base/sys_string_conversions.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
+#include "base/utf_offset_string_conversions.h"
#include "grit/net_resources.h"
#include "googleurl/src/gurl.h"
#include "googleurl/src/url_canon.h"