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

Unified Diff: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

Issue 2017113002: [Extensions] DCHECK that ExtensionFunctions respond (and only once) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 7045215ec8e0269f4062f38a85b8f478622dbbdb..aa610b7866b7dd63018746eeb97f2c212860f1aa 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
#include "components/signin/core/account_id/account_id.h"
+#include "extensions/browser/api_test_utils.h"
#include "ui/aura/test/test_windows.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
@@ -49,30 +50,17 @@ class WallpaperPrivateApiUnittest : public ash::test::AshTestBase {
DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest);
};
-class TestMinimizeFunction
- : public WallpaperPrivateMinimizeInactiveWindowsFunction {
- public:
- TestMinimizeFunction() {}
-
- bool RunAsync() override {
- return WallpaperPrivateMinimizeInactiveWindowsFunction::RunAsync();
- }
-
- protected:
- ~TestMinimizeFunction() override {}
-};
-
-class TestRestoreFunction
- : public WallpaperPrivateRestoreMinimizedWindowsFunction {
- public:
- TestRestoreFunction() {}
+bool RunMinimizeFunction() {
+ scoped_refptr<WallpaperPrivateMinimizeInactiveWindowsFunction> function(
+ new WallpaperPrivateMinimizeInactiveWindowsFunction());
+ return extensions::api_test_utils::RunFunction(function.get(), "[]", nullptr);
+}
- bool RunAsync() override {
- return WallpaperPrivateRestoreMinimizedWindowsFunction::RunAsync();
- }
- protected:
- ~TestRestoreFunction() override {}
-};
+bool RunRestoreFunction() {
+ scoped_refptr<WallpaperPrivateRestoreMinimizedWindowsFunction> function(
+ new WallpaperPrivateRestoreMinimizedWindowsFunction());
+ return extensions::api_test_utils::RunFunction(function.get(), "[]", nullptr);
+}
} // namespace
@@ -104,9 +92,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
// function.
window0_state->Activate();
EXPECT_TRUE(window0_state->IsActive());
- scoped_refptr<TestMinimizeFunction> minimize_function(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -121,9 +107,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
// Then we destroy window 0 and call the restore function.
window0.reset();
- scoped_refptr<TestRestoreFunction> restore_function(
- new TestRestoreFunction());
- EXPECT_TRUE(restore_function->RunAsync());
+ EXPECT_TRUE(RunRestoreFunction());
// Windows 1 and 2 should no longer be minimized. Window 1 should again
// be maximized. Window 3 should still be minimized. Window 4 should remain
@@ -151,9 +135,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
// function.
window0_state->Activate();
EXPECT_TRUE(window0_state->IsActive());
- scoped_refptr<TestMinimizeFunction> minimize_function_0(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -161,9 +143,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
// Calls minimize function again should be an noop if window state didn't
// change.
- scoped_refptr<TestMinimizeFunction> minimize_function_1(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_1->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -174,9 +154,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
EXPECT_FALSE(window1_state->IsMinimized());
window0_state->Activate();
- scoped_refptr<TestMinimizeFunction> minimize_function_2(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_2->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// Window 1 should be minimized again.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -184,9 +162,7 @@ TEST_F(WallpaperPrivateApiUnittest, HideAndManualUnminimizeWindows) {
// Then we destroy window 0 and call the restore function.
window0.reset();
- scoped_refptr<TestRestoreFunction> restore_function(
- new TestRestoreFunction());
- EXPECT_TRUE(restore_function->RunAsync());
+ EXPECT_TRUE(RunRestoreFunction());
// Windows 1 should no longer be minimized.
EXPECT_FALSE(window1_state->IsMinimized());
@@ -294,9 +270,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
// function.
window0_state->Activate();
EXPECT_TRUE(window0_state->IsActive());
- scoped_refptr<TestMinimizeFunction> minimize_function_0(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -312,9 +286,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
window2_state->Activate();
EXPECT_TRUE(window2_state->IsActive());
- scoped_refptr<TestMinimizeFunction> minimize_function_1(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_1->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 2 should be minimized.
EXPECT_FALSE(window2_state->IsMinimized());
@@ -336,9 +308,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
// Then we destroy window 2 and call the restore function.
window2.reset();
- scoped_refptr<TestRestoreFunction> restore_function_0(
- new TestRestoreFunction());
- EXPECT_TRUE(restore_function_0->RunAsync());
+ EXPECT_TRUE(RunRestoreFunction());
EXPECT_FALSE(window3_state->IsMinimized());
@@ -350,9 +320,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideAndRestoreWindowsTwoUsers) {
// Then we destroy window 0 and call the restore function.
window0.reset();
- scoped_refptr<TestRestoreFunction> restore_function_1(
- new TestRestoreFunction());
- EXPECT_TRUE(restore_function_1->RunAsync());
+ EXPECT_TRUE(RunRestoreFunction());
EXPECT_FALSE(window1_state->IsMinimized());
EXPECT_FALSE(window3_state->IsMinimized());
@@ -396,9 +364,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideTeleportedWindow) {
// function.
window0_state->Activate();
EXPECT_TRUE(window0_state->IsActive());
- scoped_refptr<TestMinimizeFunction> minimize_function_0(
- new TestMinimizeFunction());
- EXPECT_TRUE(minimize_function_0->RunAsync());
+ EXPECT_TRUE(RunMinimizeFunction());
// All windows except window 0 should be minimized.
EXPECT_FALSE(window0_state->IsMinimized());
@@ -411,9 +377,7 @@ TEST_F(WallpaperPrivateApiMultiUserUnittest, HideTeleportedWindow) {
// Then we destroy window 0 and call the restore function.
window0.reset();
- scoped_refptr<TestRestoreFunction> restore_function_1(
- new TestRestoreFunction());
- EXPECT_TRUE(restore_function_1->RunAsync());
+ EXPECT_TRUE(RunRestoreFunction());
EXPECT_FALSE(window1_state->IsMinimized());
EXPECT_FALSE(window2_state->IsMinimized());

Powered by Google App Engine
This is Rietveld 408576698