diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-19 22:37:31 +0000 |
| commit | d64295933cbfd3bc984e851412cc79c8a0870acf (patch) | |
| tree | 8026b726dc498f4fa6f3e886b1612541ac6f0214 /chrome/renderer/external_extension_uitest.cc | |
| parent | 4f2063cce10295e8b982e98d466c9130d754a540 (diff) | |
| download | chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.zip chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.gz chromium_src-d64295933cbfd3bc984e851412cc79c8a0870acf.tar.bz2 | |
Remove action_max_timeout_ms and fix all the callers.
(This was a TODO for phajdan.jr).
BUG=None
TEST=trybots
Review URL: http://codereview.chromium.org/6354005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/external_extension_uitest.cc')
| -rw-r--r-- | chrome/renderer/external_extension_uitest.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/chrome/renderer/external_extension_uitest.cc b/chrome/renderer/external_extension_uitest.cc index 1b622c2..d5f3885 100644 --- a/chrome/renderer/external_extension_uitest.cc +++ b/chrome/renderer/external_extension_uitest.cc @@ -1,7 +1,8 @@ -// 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. +#include "base/test/test_timeouts.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/url_constants.h" @@ -107,8 +108,10 @@ void SearchProviderTest::FinishIsSearchProviderInstalledTest( std::string cookie_name = data.host + "testResult"; std::string escaped_value = - WaitUntilCookieNonEmpty(data.tab, data.test_url, - cookie_name.c_str(), action_max_timeout_ms()); + WaitUntilCookieNonEmpty(data.tab, + data.test_url, + cookie_name.c_str(), + TestTimeouts::action_max_timeout_ms()); // Unescapes and normalizes the actual result. std::string value = UnescapeURLComponent( |