From e398a726d2aada2a325f50be21b35374bb57d7bc Mon Sep 17 00:00:00 2001 From: "phajdan.jr@chromium.org" Date: Thu, 26 Aug 2010 18:26:26 +0000 Subject: GTTF: Extract performance-testing-specific parts of UITestBase to UIPerfTest. In the future this may even be used to tune some settings/behaviors (like timeouts) for performance tests. TEST=ui_tests, page_cycler_*, etc BUG=none Review URL: http://codereview.chromium.org/3137040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57552 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_frame.gyp | 1 + chrome_frame/test/perf/chrome_frame_perftest.cc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'chrome_frame') diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp index fe06c14..a68da96 100644 --- a/chrome_frame/chrome_frame.gyp +++ b/chrome_frame/chrome_frame.gyp @@ -311,6 +311,7 @@ '../base/base.gyp:test_support_base', '../build/temp_gyp/googleurl.gyp:googleurl', '../chrome/chrome.gyp:common', + '../chrome/chrome.gyp:test_support_ui', '../chrome/chrome.gyp:utility', '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc index d283b0c..1e6bb72 100644 --- a/chrome_frame/test/perf/chrome_frame_perftest.cc +++ b/chrome_frame/test/perf/chrome_frame_perftest.cc @@ -30,7 +30,7 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_paths_internal.h" #include "chrome/test/chrome_process_util.h" -#include "chrome/test/ui/ui_test.h" +#include "chrome/test/ui/ui_perf_test.h" #include "chrome_frame/test_utils.h" #include "chrome_frame/utils.h" @@ -275,7 +275,7 @@ class ChromeFrameActiveXContainerPerf : public ChromeFrameActiveXContainer { // This class provides common functionality which can be used for most of the // ChromeFrame/Tab performance tests. -class ChromeFramePerfTestBase : public UITest { +class ChromeFramePerfTestBase : public UIPerfTest { public: ChromeFramePerfTestBase() {} protected: @@ -1312,8 +1312,8 @@ class MonitorTraceBetweenEventPair : public MonitorTraceBase, base::StringPiece event_end_; }; -// The very same as UITestBase::PrintResultXXXX without the need to -// create an UITestBase instance. +// The very same as UIPerfTest::PrintResultXXXX without the need to +// create an UIPerfTest instance. void PrintResultsImpl(const std::string& measurement, const std::string& modifier, const std::string& trace, -- cgit v1.1