summaryrefslogtreecommitdiffstats
path: root/chrome/test/reliability
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-02 19:54:58 +0000
commit0cc3dfe387313821853e658a6e2fb3b729eac9e5 (patch)
tree6bdf4d23c62ae78cafc6e7c5a2599cce70dfef22 /chrome/test/reliability
parent3c70591cc7d0d8cc162c10f7d3ac3b2ac15e4e69 (diff)
downloadchromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.zip
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.gz
chromium_src-0cc3dfe387313821853e658a6e2fb3b729eac9e5.tar.bz2
Revert 58388 - Revert 58215 - Revert 58186 - Move the keyboard files from base/ to app/.
Also moves the associated classes/enums from base:: to app::. TEST=try bots compile BUG=NONE Review URL: http://codereview.chromium.org/3165064 TBR=bryeung@chromium.org TBR=phajdan.jr@chromium.org Review URL: http://codereview.chromium.org/3361003 TBR=bryeung@chromium.org Review URL: http://codereview.chromium.org/3337006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58390 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/reliability')
-rw-r--r--chrome/test/reliability/page_load_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/reliability/page_load_test.cc b/chrome/test/reliability/page_load_test.cc
index 6289b56..a903032 100644
--- a/chrome/test/reliability/page_load_test.cc
+++ b/chrome/test/reliability/page_load_test.cc
@@ -36,11 +36,11 @@
#include <fstream>
-#include "app/keyboard_codes.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/file_util.h"
#include "base/file_version_info.h"
+#include "base/keyboard_codes.h"
#include "base/i18n/time_formatting.h"
#include "base/path_service.h"
#include "base/string_number_conversions.h"
@@ -209,9 +209,9 @@ class PageLoadTest : public UITest {
scoped_refptr<WindowProxy> window(browser->GetWindow());
if (window.get()) {
if (browser->BringToFront()) {
- window->SimulateOSKeyPress(app::VKEY_NEXT, 0);
+ window->SimulateOSKeyPress(base::VKEY_NEXT, 0);
PlatformThread::Sleep(sleep_timeout_ms());
- window->SimulateOSKeyPress(app::VKEY_NEXT, 0);
+ window->SimulateOSKeyPress(base::VKEY_NEXT, 0);
PlatformThread::Sleep(sleep_timeout_ms());
}
}