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

Side by Side Diff: chrome/browser/ui/tests/browser_uitest.cc

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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/browser/unload_uitest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base_paths.h" 5 #include "base/base_paths.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/sys_info.h" 10 #include "base/sys_info.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 scoped_refptr<TabProxy> tab(GetActiveTab()); 233 scoped_refptr<TabProxy> tab(GetActiveTab());
234 ASSERT_TRUE(tab.get()); 234 ASSERT_TRUE(tab.get());
235 235
236 FilePath test_file(test_data_directory_); 236 FilePath test_file(test_data_directory_);
237 test_file = test_file.AppendASCII("fileurl_universalaccess.html"); 237 test_file = test_file.AppendASCII("fileurl_universalaccess.html");
238 238
239 GURL url = net::FilePathToFileURL(test_file); 239 GURL url = net::FilePathToFileURL(test_file);
240 ASSERT_TRUE(tab->NavigateToURL(url)); 240 ASSERT_TRUE(tab->NavigateToURL(url));
241 241
242 std::string value = WaitUntilCookieNonEmpty(tab.get(), url, 242 std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
243 "status", action_max_timeout_ms()); 243 "status", TestTimeouts::action_max_timeout_ms());
244 ASSERT_STREQ("Disallowed", value.c_str()); 244 ASSERT_STREQ("Disallowed", value.c_str());
245 } 245 }
246 246
247 #if !defined(OS_MACOSX) 247 #if !defined(OS_MACOSX)
248 class KioskModeTest : public UITest { 248 class KioskModeTest : public UITest {
249 public: 249 public:
250 KioskModeTest() { 250 KioskModeTest() {
251 launch_arguments_.AppendSwitch(switches::kKioskMode); 251 launch_arguments_.AppendSwitch(switches::kKioskMode);
252 } 252 }
253 }; 253 };
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 EXPECT_EQ(0, window_count); 377 EXPECT_EQ(0, window_count);
378 378
379 // Starting a browser window should work just fine. 379 // Starting a browser window should work just fine.
380 ASSERT_TRUE(IsBrowserRunning()); 380 ASSERT_TRUE(IsBrowserRunning());
381 ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true)); 381 ASSERT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_NORMAL, true));
382 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count)); 382 ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count));
383 EXPECT_EQ(1, window_count); 383 EXPECT_EQ(1, window_count);
384 } 384 }
385 385
386 } // namespace 386 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/tab_restore_uitest.cc ('k') | chrome/browser/unload_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698