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

Unified Diff: chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm

Issue 11230023: Web Intents Mac: Add view animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address review comment Created 8 years, 2 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/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm
index 672f78519c401261baac3f1c02756bcd6cba3278..b054ccd3511a1304cd44595acb9cbabf142990fd 100644
--- a/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm
@@ -26,6 +26,7 @@
#include "chrome/common/extensions/extension.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "content/public/browser/web_contents.h"
+#include "content/public/test/test_utils.h"
#include "ipc/ipc_message.h"
#import "testing/gtest_mac.h"
@@ -94,6 +95,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, Waiting) {
// Test the "no matching services" state.
IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, NoServices) {
model_.SetWaitingForSuggestions(false);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_NO_SERVICE, [controller_ state]);
WebIntentMessageViewController* message_controller =
[controller_ messageViewController];
@@ -118,6 +120,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, ChooseService) {
suggestions.push_back(suggestion);
model_.AddSuggestedExtensions(suggestions);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_CHOOSE_SERVICE, [controller_ state]);
WebIntentChooseServiceViewController* choose_controller =
[controller_ chooseServiceViewController];
@@ -145,6 +148,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, ChooseService) {
// Remove everything but suggested extensions.
model_.Clear();
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_CHOOSE_SERVICE, [controller_ state]);
rows = [choose_controller rows];
EXPECT_EQ(1u, [rows count]);
@@ -171,6 +175,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, InlineService) {
webkit_glue::WebIntentServiceData::DISPOSITION_INLINE;
model_.AddInstalledService(ASCIIToUTF16("Title"), url, disposition);
model_.SetInlineDisposition(url);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_INLINE_SERVICE, [controller_ state]);
WebIntentInlineServiceViewController * inline_controller =
@@ -200,6 +205,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, Installing) {
// Set a pending extension download.
model_.SetWaitingForSuggestions(false);
model_.SetPendingExtensionInstallId(suggestion.id);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_INSTALLING_EXTENSION, [controller_ state]);
WebIntentProgressViewController* progress_controller =
@@ -211,6 +217,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, Installing) {
int percent_done = 50;
model_.SetPendingExtensionInstallDownloadProgress(percent_done);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(percent_done, [progress_indicator percentDone]);
}
@@ -225,6 +232,7 @@ IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, ExtensionPrompt) {
// Set a pending install prompt.
model_.SetPendingExtensionInstallDelegate(&delegate);
model_.SetPendingExtensionInstallPrompt(prompt);
+ content::RunAllPendingInMessageLoop();
EXPECT_EQ(PICKER_STATE_EXTENSION_PROMPT, [controller_ state]);
// Verify that the view controll is embedded.

Powered by Google App Engine
This is Rietveld 408576698