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

Side by Side Diff: chrome/test/ppapi/ppapi_browsertest.cc

Issue 10787010: Switch to TimeDelta interfaces in chrome automation test infrastructure. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase onto master. Created 8 years, 5 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
« no previous file with comments | « chrome/test/perf/v8_benchmark_uitest.cc ('k') | chrome/test/ppapi/ppapi_test.h » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "chrome/test/ppapi/ppapi_test.h" 5 #include "chrome/test/ppapi/ppapi_test.h"
6 6
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_navigator.h" 10 #include "chrome/browser/ui/browser_navigator.h"
(...skipping 707 matching lines...) Expand 10 before | Expand all | Expand 10 after
718 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK); 718 chrome::NavigateParams params(browser(), url, content::PAGE_TRANSITION_LINK);
719 params.disposition = NEW_BACKGROUND_TAB; 719 params.disposition = NEW_BACKGROUND_TAB;
720 ui_test_utils::NavigateToURL(&params); 720 ui_test_utils::NavigateToURL(&params);
721 } 721 }
722 722
723 // This test messes with tab visibility so is custom. 723 // This test messes with tab visibility so is custom.
724 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) { 724 IN_PROC_BROWSER_TEST_F(OutOfProcessPPAPITest, View_PageHideShow) {
725 // The plugin will be loaded in the foreground tab and will send us a message. 725 // The plugin will be loaded in the foreground tab and will send us a message.
726 TestFinishObserver observer( 726 TestFinishObserver observer(
727 chrome::GetActiveWebContents(browser())->GetRenderViewHost(), 727 chrome::GetActiveWebContents(browser())->GetRenderViewHost(),
728 TestTimeouts::action_max_timeout_ms()); 728 TestTimeouts::action_max_timeout());
729 729
730 GURL url = GetTestFileUrl("View_PageHideShow"); 730 GURL url = GetTestFileUrl("View_PageHideShow");
731 ui_test_utils::NavigateToURL(browser(), url); 731 ui_test_utils::NavigateToURL(browser(), url);
732 732
733 ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out."; 733 ASSERT_TRUE(observer.WaitForFinish()) << "Test timed out.";
734 EXPECT_STREQ("TestPageHideShow:Created", observer.result().c_str()); 734 EXPECT_STREQ("TestPageHideShow:Created", observer.result().c_str());
735 observer.Reset(); 735 observer.Reset();
736 736
737 // Make a new tab to cause the original one to hide, this should trigger the 737 // Make a new tab to cause the original one to hide, this should trigger the
738 // next phase of the test. 738 // next phase of the test.
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit) 801 TEST_PPAPI_OUT_OF_PROCESS(FlashMessageLoop_RunWithoutQuit)
802 802
803 TEST_PPAPI_IN_PROCESS(MouseCursor) 803 TEST_PPAPI_IN_PROCESS(MouseCursor)
804 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor) 804 TEST_PPAPI_OUT_OF_PROCESS(MouseCursor)
805 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor) 805 TEST_PPAPI_NACL_VIA_HTTP(MouseCursor)
806 806
807 // Only enabled in out-of-process mode. 807 // Only enabled in out-of-process mode.
808 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile) 808 TEST_PPAPI_OUT_OF_PROCESS(FlashFile_CreateTemporaryFile)
809 809
810 #endif // ADDRESS_SANITIZER 810 #endif // ADDRESS_SANITIZER
OLDNEW
« no previous file with comments | « chrome/test/perf/v8_benchmark_uitest.cc ('k') | chrome/test/ppapi/ppapi_test.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698