diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:41:05 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:41:05 +0000 |
| commit | 750b2f3c43e60b14c754479ff103132e84a99476 (patch) | |
| tree | eda74b31adb1400714cf62cbd47ec5d6b7c56da1 /net/test | |
| parent | 0a4fb36fe33699992ba423269544b076532991f5 (diff) | |
| download | chromium_src-750b2f3c43e60b14c754479ff103132e84a99476.zip chromium_src-750b2f3c43e60b14c754479ff103132e84a99476.tar.gz chromium_src-750b2f3c43e60b14c754479ff103132e84a99476.tar.bz2 | |
Use a direct include of utf_string_conversions.h in net/.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/15995039
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204876 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/test')
| -rw-r--r-- | net/test/python_utils.cc | 2 | ||||
| -rw-r--r-- | net/test/spawned_test_server/local_test_server_win.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/test/python_utils.cc b/net/test/python_utils.cc index 483aed7..209b50a 100644 --- a/net/test/python_utils.cc +++ b/net/test/python_utils.cc @@ -12,7 +12,7 @@ #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" const char kPythonPathEnv[] = "PYTHONPATH"; diff --git a/net/test/spawned_test_server/local_test_server_win.cc b/net/test/spawned_test_server/local_test_server_win.cc index 656c67b..6b7da93 100644 --- a/net/test/spawned_test_server/local_test_server_win.cc +++ b/net/test/spawned_test_server/local_test_server_win.cc @@ -16,9 +16,9 @@ #include "base/process_util.h" #include "base/string_number_conversions.h" #include "base/string_util.h" +#include "base/strings/utf_string_conversions.h" #include "base/test/test_timeouts.h" #include "base/threading/thread.h" -#include "base/utf_string_conversions.h" #include "base/win/scoped_handle.h" #include "net/test/python_utils.h" |