summaryrefslogtreecommitdiffstats
path: root/content/test
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 20:48:00 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 20:48:00 +0000
commit74ebfb1e113e26bb16d79ade8918d5f86035f278 (patch)
tree36af43b99d9b7e4692bac532dc3db1558ddff977 /content/test
parentc742f1ad84a6a2748a375ae2f496fa02c3bcdb56 (diff)
downloadchromium_src-74ebfb1e113e26bb16d79ade8918d5f86035f278.zip
chromium_src-74ebfb1e113e26bb16d79ade8918d5f86035f278.tar.gz
chromium_src-74ebfb1e113e26bb16d79ade8918d5f86035f278.tar.bz2
Use a direct include of utf_string_conversions.h in content/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16408017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test')
-rw-r--r--content/test/content_browser_test_test.cc2
-rw-r--r--content/test/layout_browsertest.cc2
-rw-r--r--content/test/net/url_request_mock_http_job.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/content/test/content_browser_test_test.cc b/content/test/content_browser_test_test.cc
index 568ff00..960ea9b 100644
--- a/content/test/content_browser_test_test.cc
+++ b/content/test/content_browser_test_test.cc
@@ -5,7 +5,7 @@
#include "content/test/content_browser_test.h"
#include "base/command_line.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/browser_test_utils.h"
#include "content/shell/shell.h"
diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc
index d6aeb25..c1c02ac 100644
--- a/content/test/layout_browsertest.cc
+++ b/content/test/layout_browsertest.cc
@@ -15,7 +15,7 @@
#include "base/run_loop.h"
#include "base/string_util.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/common/content_paths.h"
#include "content/public/test/browser_test_utils.h"
diff --git a/content/test/net/url_request_mock_http_job.cc b/content/test/net/url_request_mock_http_job.cc
index 2c4ace5..37dfe00 100644
--- a/content/test/net/url_request_mock_http_job.cc
+++ b/content/test/net/url_request_mock_http_job.cc
@@ -7,8 +7,8 @@
#include "base/file_util.h"
#include "base/message_loop.h"
#include "base/string_util.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/threading/thread_restrictions.h"
-#include "base/utf_string_conversions.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
#include "net/http/http_response_headers.h"