Re-lands 58186:

chrome/test/reliability/page_load_test.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // This file provides reliablity test which runs under UI test framework. The
 // test is intended to run within QEMU environment.
 //
 // Usage 1: reliability_test
 // Upon invocation, it visits a hard coded list of sample URLs. This is mainly
 // used by buildbot, to verify reliability_test itself runs ok.
@@ skipping 18 matching lines @@
 // --endurl=url: visits the specified url in the end.
 // --logfile=filepath: saves the visit log to the specified path.
 // --timeout=millisecond: time out as specified in millisecond during each
 //                        page load.
 // --nopagedown: won't simulate page down key presses after page load.
 // --noclearprofile: do not clear profile dir before firing up each time.
 // --savedebuglog: save Chrome, V8, and test debug log for each page loaded.
 
 #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"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
 #include "base/time.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 148 matching lines @@
 
       if (result == AUTOMATION_MSG_NAVIGATION_SUCCESS) {
         if (g_page_down) {
           // Page down twice.
           scoped_refptr<BrowserProxy> browser(
               automation()->GetBrowserWindow(0));
           if (browser.get()) {
             scoped_refptr<WindowProxy> window(browser->GetWindow());
             if (window.get()) {
               if (browser->BringToFront()) {
-                window->SimulateOSKeyPress(base::VKEY_NEXT, 0);
+                window->SimulateOSKeyPress(app::VKEY_NEXT, 0);
                 PlatformThread::Sleep(sleep_timeout_ms());
-                window->SimulateOSKeyPress(base::VKEY_NEXT, 0);
+                window->SimulateOSKeyPress(app::VKEY_NEXT, 0);
                 PlatformThread::Sleep(sleep_timeout_ms());
               }
             }
           }
         }
       }
     }
 
     // Log navigate complete time.
     time_now = base::Time::Now();
@@ skipping 491 matching lines @@
             parsed_command_line.GetSwitchValuePath(switches::kJavaScriptFlags));
         if (v8_command_line.HasSwitch(kV8LogFileSwitch)) {
           g_v8_log_path = v8_command_line.GetSwitchValuePath(kV8LogFileSwitch);
           if (!file_util::AbsolutePath(&g_v8_log_path))
             g_v8_log_path = FilePath();
         }
       }
     }
   }
 }