diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:57:07 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-01-28 21:57:07 +0000 |
| commit | cc8723746d3f6606a2aa7a022a8ead81e9126695 (patch) | |
| tree | 142770835522925ad6844e0478257d014d57d5f9 /chrome/test/perf | |
| parent | 02430df2fe3edf17dc8f2b33f971abd292f219d8 (diff) | |
| download | chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.zip chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.tar.gz chromium_src-cc8723746d3f6606a2aa7a022a8ead81e9126695.tar.bz2 | |
Remove TabStripModel wrapper use.
BUG=167548
TEST=no functional change
Review URL: https://chromiumcodereview.appspot.com/11953065
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179199 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
| -rw-r--r-- | chrome/test/perf/rendering/latency_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/perf/rendering/throughput_tests.cc | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/chrome/test/perf/rendering/latency_tests.cc b/chrome/test/perf/rendering/latency_tests.cc index 639c26e..1e51a5b 100644 --- a/chrome/test/perf/rendering/latency_tests.cc +++ b/chrome/test/perf/rendering/latency_tests.cc @@ -14,7 +14,7 @@ #include "base/timer.h" #include "base/version.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" #include "chrome/test/base/tracing.h" @@ -647,7 +647,7 @@ void LatencyTest::GetMeanFrameTimeMicros(int* frame_time) const { void LatencyTest::SendInput() { content::RenderViewHost* rvh = - chrome::GetActiveWebContents(browser())->GetRenderViewHost(); + browser()->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(); WebKit::WebMouseEvent mouse_event; mouse_event.movementX = 1; mouse_x_ += mouse_event.movementX; diff --git a/chrome/test/perf/rendering/throughput_tests.cc b/chrome/test/perf/rendering/throughput_tests.cc index 2757425..e58b898 100644 --- a/chrome/test/perf/rendering/throughput_tests.cc +++ b/chrome/test/perf/rendering/throughput_tests.cc @@ -15,8 +15,8 @@ #include "base/values.h" #include "chrome/browser/net/url_fixer_upper.h" #include "chrome/browser/ui/browser.h" -#include "chrome/browser/ui/browser_tabstrip.h" #include "chrome/browser/ui/browser_window.h" +#include "chrome/browser/ui/tabs/tab_strip_model.h" #include "chrome/browser/ui/window_snapshot/window_snapshot.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/chrome_switches.h" @@ -220,7 +220,7 @@ class ThroughputTest : public BrowserPerfTest { gfx::Rect root_bounds = browser()->window()->GetBounds(); gfx::Rect tab_contents_bounds; - chrome::GetActiveWebContents(browser())->GetContainerBounds( + browser()->tab_strip_model()->GetActiveWebContents()->GetContainerBounds( &tab_contents_bounds); gfx::Rect snapshot_bounds(tab_contents_bounds.x() - root_bounds.x(), @@ -327,7 +327,8 @@ class ThroughputTest : public BrowserPerfTest { LOG(INFO) << gurl_.possibly_invalid_spec(); ui_test_utils::NavigateToURLWithDisposition( browser(), gurl_, CURRENT_TAB, ui_test_utils::BROWSER_TEST_NONE); - content::WaitForLoadStop(chrome::GetActiveWebContents(browser())); + content::WaitForLoadStop( + browser()->tab_strip_model()->GetActiveWebContents()); // Let the test spin up. LOG(INFO) << "Spinning up test..."; @@ -389,7 +390,7 @@ class ThroughputTest : public BrowserPerfTest { // Close the tab so that we can quit without timing out during the // wait-for-idle stage in browser_test framework. - chrome::GetActiveWebContents(browser())->Close(); + browser()->tab_strip_model()->GetActiveWebContents()->Close(); } private: |