summaryrefslogtreecommitdiffstats
path: root/chrome/test
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 09:25:57 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-02 09:25:57 +0000
commit07750be2599b9699ec29b91a5cd1d4c86814700d (patch)
tree9f8c02ab08b84807eb5c4077cbacecebf1a41b33 /chrome/test
parentaaacc6af10018284746459ab10d38aeab9d51490 (diff)
downloadchromium_src-07750be2599b9699ec29b91a5cd1d4c86814700d.zip
chromium_src-07750be2599b9699ec29b91a5cd1d4c86814700d.tar.gz
chromium_src-07750be2599b9699ec29b91a5cd1d4c86814700d.tar.bz2
2nd try: Figure out error in test PrepopulateRespectBlank.
(This is the same changelist, except added a check for Chromium as well as Google Chrome and trace out the window name found when the assert fires). Revert previous traces and add one targeted test. My traces seem to indicate that something else than a Chrome window has focus when the test fails. Lets figure out what that is... TBR=maruel BUG=62937 TEST=Tracking down problem in test Review URL: http://codereview.chromium.org/5468001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test')
-rw-r--r--chrome/test/ui_test_utils.cc10
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc
index e303b30..e96860d 100644
--- a/chrome/test/ui_test_utils.cc
+++ b/chrome/test/ui_test_utils.cc
@@ -348,12 +348,6 @@ bool ExecuteJavaScriptHelper(RenderViewHost* render_view_host,
return true;
}
-void Checkpoint(const char* message, const base::TimeTicks& start_time) {
- LOG(INFO) << message << " : "
- << (base::TimeTicks::Now() - start_time).InMilliseconds()
- << " ms" << std::flush;
-}
-
} // namespace
void RunMessageLoop() {
@@ -619,13 +613,11 @@ bool SendKeyPressSync(const Browser* browser,
bool alt,
bool command) {
base::TimeTicks start_time = base::TimeTicks::Now();
- Checkpoint("SendKeyPressSync", start_time);
gfx::NativeWindow window = NULL;
if (!GetNativeWindow(browser, &window))
return false;
- Checkpoint("SendKeyPressNotifyWhenDone", start_time);
if (!ui_controls::SendKeyPressNotifyWhenDone(
window, key, control, shift, alt, command,
new MessageLoop::QuitTask())) {
@@ -635,9 +627,7 @@ bool SendKeyPressSync(const Browser* browser,
// Run the message loop. It'll stop running when either the key was received
// or the test timed out (in which case testing::Test::HasFatalFailure should
// be set).
- Checkpoint("Running loop", start_time);
RunMessageLoop();
- Checkpoint("Check if HasFatalFailure", start_time);
return !testing::Test::HasFatalFailure();
}