summaryrefslogtreecommitdiffstats
path: root/chrome/test/automation
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-08 22:38:41 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-08 22:38:41 +0000
commit3ea1b18715919a522c6711e5ca5f2fd40e485850 (patch)
treee17d17820edba1ce729fbe9948a23b498bfe1286 /chrome/test/automation
parent5ffc16b6a8ab99e5470cd23645fd3a12a04c6a0e (diff)
downloadchromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.zip
chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.gz
chromium_src-3ea1b18715919a522c6711e5ca5f2fd40e485850.tar.bz2
Rename FilePath to base::FilePath and use new location of string_number_conversions in some chrome subdirectories.
Review URL: https://codereview.chromium.org/12218065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181564 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/automation')
-rw-r--r--chrome/test/automation/automation_json_requests.h2
-rw-r--r--chrome/test/automation/proxy_launcher.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/automation/automation_json_requests.h b/chrome/test/automation/automation_json_requests.h
index 6f1fb45..120a542 100644
--- a/chrome/test/automation/automation_json_requests.h
+++ b/chrome/test/automation/automation_json_requests.h
@@ -10,7 +10,7 @@
#include "base/compiler_specific.h"
#include "base/file_path.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
#include "chrome/common/automation_constants.h"
#include "chrome/common/automation_id.h"
#include "ui/base/keycodes/keyboard_codes.h"
diff --git a/chrome/test/automation/proxy_launcher.cc b/chrome/test/automation/proxy_launcher.cc
index b06f86d..bb20dad 100644
--- a/chrome/test/automation/proxy_launcher.cc
+++ b/chrome/test/automation/proxy_launcher.cc
@@ -8,9 +8,9 @@
#include "base/environment.h"
#include "base/file_util.h"
-#include "base/string_number_conversions.h"
#include "base/string_split.h"
#include "base/stringprintf.h"
+#include "base/strings/string_number_conversions.h"
#include "base/test/test_file_util.h"
#include "base/test/test_timeouts.h"
#include "base/utf_string_conversions.h"