summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/proxy
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 23:46:18 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 23:46:18 +0000
commit112158af2b74ec67707c85f6df26fb5547b37b6f (patch)
tree4fd6ac75eab55eebe72b7cc05d8ff5e96662af36 /chrome/browser/extensions/api/proxy
parent5b86251b266a60f8fe4fee2e942b8299a75935cc (diff)
downloadchromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.zip
chromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.tar.gz
chromium_src-112158af2b74ec67707c85f6df26fb5547b37b6f.tar.bz2
Use a direct include of utf_string_conversions.h in chrome/browser/, part 2.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/16561007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/api/proxy')
-rw-r--r--chrome/browser/extensions/api/proxy/proxy_api.cc2
-rw-r--r--chrome/browser/extensions/api/proxy/proxy_api_helpers.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/api/proxy/proxy_api.cc b/chrome/browser/extensions/api/proxy/proxy_api.cc
index 5e811bd..44d836c 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api.cc
@@ -8,7 +8,7 @@
#include "base/json/json_writer.h"
#include "base/stringprintf.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
#include "chrome/browser/extensions/api/proxy/proxy_api_helpers.h"
diff --git a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
index 564376c..730a767 100644
--- a/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
+++ b/chrome/browser/extensions/api/proxy/proxy_api_helpers.cc
@@ -17,7 +17,7 @@
#include "base/basictypes.h"
#include "base/string_util.h"
#include "base/strings/string_tokenizer.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/proxy/proxy_api_constants.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"