diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:37:03 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-02 23:37:03 +0000 |
| commit | 5c6ac84a3d364dccc6ef221b4370c76a95c93e2b (patch) | |
| tree | 95cd6d7cc72628db0c94a674a1138835cecc8157 /chrome/test/perf | |
| parent | e2716a58c9aa6dcda4b64b65b5a402ac5ece74ac (diff) | |
| download | chromium_src-5c6ac84a3d364dccc6ef221b4370c76a95c93e2b.zip chromium_src-5c6ac84a3d364dccc6ef221b4370c76a95c93e2b.tar.gz chromium_src-5c6ac84a3d364dccc6ef221b4370c76a95c93e2b.tar.bz2 | |
Update chrome/ to use scoped_refptr<T>::get() rather than implicit "operator T*"
Linux fixes, Part 1 of N
BUG=110610
TBR=darin
Review URL: https://chromiumcodereview.appspot.com/15836003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203632 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/perf')
| -rw-r--r-- | chrome/test/perf/frame_rate/frame_rate_tests.cc | 4 | ||||
| -rw-r--r-- | chrome/test/perf/perf_ui_test_suite.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/chrome/test/perf/frame_rate/frame_rate_tests.cc b/chrome/test/perf/frame_rate/frame_rate_tests.cc index 7b36b27..d34388e 100644 --- a/chrome/test/perf/frame_rate/frame_rate_tests.cc +++ b/chrome/test/perf/frame_rate/frame_rate_tests.cc @@ -196,7 +196,7 @@ class FrameRateTest // race condition caused by an html redirect. If that is the case, verify // that flag kHasRedirect is enabled for the current test. ASSERT_TRUE(WaitUntilJavaScriptCondition( - tab, + tab.get(), std::wstring(), L"window.domAutomationController.send(__initialized);", TestTimeouts::large_test_timeout())); @@ -211,7 +211,7 @@ class FrameRateTest // Block until the tests completes. ASSERT_TRUE(WaitUntilJavaScriptCondition( - tab, + tab.get(), std::wstring(), L"window.domAutomationController.send(!__running_all);", TestTimeouts::large_test_timeout())); diff --git a/chrome/test/perf/perf_ui_test_suite.cc b/chrome/test/perf/perf_ui_test_suite.cc index 1f15015..0c6312d 100644 --- a/chrome/test/perf/perf_ui_test_suite.cc +++ b/chrome/test/perf/perf_ui_test_suite.cc @@ -153,7 +153,7 @@ void PerfUITestSuite::BuildCachedThemePakIn( *valid_value, Extension::NO_FLAGS, &error); - if (!extension) + if (!extension.get()) LOG(FATAL) << "Error loading theme extension: " << error; // Build the "Cached Theme.pak" file in the template. (It's not committed @@ -166,8 +166,8 @@ void PerfUITestSuite::BuildCachedThemePakIn( &message_loop_); scoped_refptr<BrowserThemePack> theme( - BrowserThemePack::BuildFromExtension(extension)); - if (!theme) + BrowserThemePack::BuildFromExtension(extension.get())); + if (!theme.get()) LOG(FATAL) << "Failed to load theme from extension"; theme->WriteToDisk(extension_base.AppendASCII("Cached Theme.pak")); |