Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Unified Diff: chrome/test/pyautolib/pyautolib.h

Issue 6354005: Remove action_max_timeout_ms and fix all the callers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | chrome/test/ui/history_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/pyautolib/pyautolib.h
diff --git a/chrome/test/pyautolib/pyautolib.h b/chrome/test/pyautolib/pyautolib.h
index fe037790d9606212fe5f039f18565e1675bfdda6..8f1fe2674a038205064e7a278608b4ede0087b6b 100644
--- a/chrome/test/pyautolib/pyautolib.h
+++ b/chrome/test/pyautolib/pyautolib.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
//
@@ -11,6 +11,7 @@
#include "base/message_loop.h"
#include "base/mac/scoped_nsautorelease_pool.h"
+#include "base/test/test_timeouts.h"
#include "chrome/test/ui/ui_test.h"
#include "chrome/test/ui/ui_test_suite.h"
@@ -184,6 +185,10 @@ class PyUITestBase : public UITestBase {
std::string GetCookie(const GURL& cookie_url, int window_index = 0,
int tab_index = 0);
+ int action_max_timeout_ms() const {
+ return TestTimeouts::action_max_timeout_ms();
+ }
+
private:
// Enables PostTask to main thread.
// Should be shared across multiple instances of PyUITestBase so that this
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | chrome/test/ui/history_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698