summaryrefslogtreecommitdiffstats
path: root/chrome/test/ui
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 21:23:26 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-07 21:23:26 +0000
commitabfd149a77db75e1be6543c70b77882dcbc300f4 (patch)
treed620753c54af2bce4d84caa2d373a4c5789f0b24 /chrome/test/ui
parentdc4c90f452e81628b0dc9b0415385eb680754bee (diff)
downloadchromium_src-abfd149a77db75e1be6543c70b77882dcbc300f4.zip
chromium_src-abfd149a77db75e1be6543c70b77882dcbc300f4.tar.gz
chromium_src-abfd149a77db75e1be6543c70b77882dcbc300f4.tar.bz2
Use a direct include of utf_string_conversions.h in chrome/renderer/, chrome/service/, chrome/test/, chrome/third_party/, chrome/tools/.
BUG=none TEST=none TBR=ben@chromium.org Review URL: https://chromiumcodereview.appspot.com/15709008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204931 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui')
-rw-r--r--chrome/test/ui/javascript_test_util.cc2
-rw-r--r--chrome/test/ui/ui_test.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/ui/javascript_test_util.cc b/chrome/test/ui/javascript_test_util.cc
index 953bc22..c0ded05 100644
--- a/chrome/test/ui/javascript_test_util.cc
+++ b/chrome/test/ui/javascript_test_util.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/strings/string_number_conversions.h"
-#include "base/utf_string_conversions.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/values.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/test/ui/ui_test.cc b/chrome/test/ui/ui_test.cc
index a767298..7870951 100644
--- a/chrome/test/ui/ui_test.cc
+++ b/chrome/test/ui/ui_test.cc
@@ -26,11 +26,11 @@
#include "base/process_util.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/string_split.h"
+#include "base/strings/utf_string_conversions.h"
#include "base/test/test_file_util.h"
#include "base/test/test_timeouts.h"
#include "base/threading/platform_thread.h"
#include "base/time.h"
-#include "base/utf_string_conversions.h"
#include "chrome/app/chrome_command_ids.h"
#include "chrome/browser/net/url_fixer_upper.h"
#include "chrome/browser/profiles/profile_impl.h"