summaryrefslogtreecommitdiffstats
path: root/content/browser/loader/resource_dispatcher_host_browsertest.cc
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/browser/loader/resource_dispatcher_host_browsertest.cc
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/browser/loader/resource_dispatcher_host_browsertest.cc')
-rw-r--r--content/browser/loader/resource_dispatcher_host_browsertest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/loader/resource_dispatcher_host_browsertest.cc b/content/browser/loader/resource_dispatcher_host_browsertest.cc
index 2cb1124..91d56b6 100644
--- a/content/browser/loader/resource_dispatcher_host_browsertest.cc
+++ b/content/browser/loader/resource_dispatcher_host_browsertest.cc
@@ -3,7 +3,7 @@
// found in the LICENSE file.
#include "base/string_util.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "content/browser/download/download_manager_impl.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/browser/browser_context.h"
@@ -21,8 +21,8 @@
#include "content/test/net/url_request_mock_http_job.h"
#include "net/base/net_errors.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "net/test/embedded_test_server/http_response.h"
#include "net/test/embedded_test_server/http_request.h"
+#include "net/test/embedded_test_server/http_response.h"
namespace content {