summaryrefslogtreecommitdiffstats
path: root/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
diff options
context:
space:
mode:
authorkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-03 03:41:43 +0000
committerkalman@chromium.org <kalman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-03 03:41:43 +0000
commita0c91a9ffb1db127cf1f06e285b208a544ed4567 (patch)
treefe0e8f09a1c04cab35592cd46f9c01c045f95681 /chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
parent68d3f6bbacbde53e968ae36ae3e4231ea1a8be4b (diff)
downloadchromium_src-a0c91a9ffb1db127cf1f06e285b208a544ed4567.zip
chromium_src-a0c91a9ffb1db127cf1f06e285b208a544ed4567.tar.gz
chromium_src-a0c91a9ffb1db127cf1f06e285b208a544ed4567.tar.bz2
Drive extension functions from ExtensionFunction::Run. The
SyncExtensionFunction and AsyncExtensionFunction derivates now expose RunSync and RunAsync respectively. New extension function implementations should just implement Run directly. BUG=365732 R=rockot@chromium.org TBR=dmazzoni@chromium.org Review URL: https://codereview.chromium.org/257333002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@268033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc')
-rw-r--r--chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc32
1 files changed, 16 insertions, 16 deletions
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index ea63359..515f586 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -51,8 +51,8 @@ class TestMinimizeFunction
public:
TestMinimizeFunction() {}
- virtual bool RunImpl() OVERRIDE {
- return WallpaperPrivateMinimizeInactiveWindowsFunction::RunImpl();
+ virtual bool RunAsync() OVERRIDE {
+ return WallpaperPrivateMinimizeInactiveWindowsFunction::RunAsync();
}
protected:
@@ -64,8 +64,8 @@ class TestRestoreFunction
public:
TestRestoreFunction() {}
- virtual bool RunImpl() OVERRIDE {
- return WallpaperPrivateRestoreMinimizedWindowsFunction::RunImpl();
+ virtual bool RunAsync() OVERRIDE {
+ return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync();
}
protected:
virtual ~TestRestoreFunction() {}
@@ -100,7 +100,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
EXPECT_TRUE(window0_state->IsActive());
scoped_refptr<TestMinimizeFunction> minimize_function(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function->RunImpl());
+ EXPECT_TRUE(minimize_function->RunAsync());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -112,7 +112,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
window0.reset();
scoped_refptr<TestRestoreFunction> restore_function(
new TestRestoreFunction());
- EXPECT_TRUE(restore_function->RunImpl());
+ EXPECT_TRUE(restore_function->RunAsync());
// Windows 1 and 2 should no longer be minimized. Window 1 should again
// be maximized. Window 3 should still be minimized.
@@ -140,7 +140,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
EXPECT_TRUE(window0_state->IsActive());
scoped_refptr<TestMinimizeFunction> minimize_function_0(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunImpl());
+ EXPECT_TRUE(minimize_function_0->RunAsync());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -150,7 +150,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
// change.
scoped_refptr<TestMinimizeFunction> minimize_function_1(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_1->RunImpl());
+ EXPECT_TRUE(minimize_function_1->RunAsync());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -163,7 +163,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
scoped_refptr<TestMinimizeFunction> minimize_function_2(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_2->RunImpl());
+ EXPECT_TRUE(minimize_function_2->RunAsync());
// Window 1 should be minimized again.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -173,7 +173,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
window0.reset();
scoped_refptr<TestRestoreFunction> restore_function(
new TestRestoreFunction());
- EXPECT_TRUE(restore_function->RunImpl());
+ EXPECT_TRUE(restore_function->RunAsync());
// Windows 1 should no longer be minimized.
EXPECT_FALSE(window1_state->IsMinimized());
@@ -280,7 +280,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
EXPECT_TRUE(window0_state->IsActive());
scoped_refptr<TestMinimizeFunction> minimize_function_0(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunImpl());
+ EXPECT_TRUE(minimize_function_0->RunAsync());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -298,7 +298,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
EXPECT_TRUE(window2_state->IsActive());
scoped_refptr<TestMinimizeFunction> minimize_function_1(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_1->RunImpl());
+ EXPECT_TRUE(minimize_function_1->RunAsync());
// All windows except window 2 should be minimized.
EXPECT_FALSE(window2_state->IsMinimized());
@@ -322,7 +322,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
window2.reset();
scoped_refptr<TestRestoreFunction> restore_function_0(
new TestRestoreFunction());
- EXPECT_TRUE(restore_function_0->RunImpl());
+ EXPECT_TRUE(restore_function_0->RunAsync());
EXPECT_FALSE(window3_state->IsMinimized());
@@ -336,7 +336,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
window0.reset();
scoped_refptr<TestRestoreFunction> restore_function_1(
new TestRestoreFunction());
- EXPECT_TRUE(restore_function_1->RunImpl());
+ EXPECT_TRUE(restore_function_1->RunAsync());
EXPECT_FALSE(window1_state->IsMinimized());
EXPECT_FALSE(window3_state->IsMinimized());
@@ -380,7 +380,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideTeleportedWindow) {
EXPECT_TRUE(window0_state->IsActive());
scoped_refptr<TestMinimizeFunction> minimize_function_0(
new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunImpl());
+ EXPECT_TRUE(minimize_function_0->RunAsync());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -395,7 +395,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideTeleportedWindow) {
window0.reset();
scoped_refptr<TestRestoreFunction> restore_function_1(
new TestRestoreFunction());
- EXPECT_TRUE(restore_function_1->RunImpl());
+ EXPECT_TRUE(restore_function_1->RunAsync());
EXPECT_FALSE(window1_state->IsMinimized());
EXPECT_FALSE(window2_state->IsMinimized());