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

Unified Diff: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc

Issue 10823424: Make sure controller is properly reset when the picker is closed. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix browser tests. Created 8 years, 4 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
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
diff --git a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
index 0815cc1f06a400728a142843efe31ab7a68a607d..ae167e9b5f5a164f7cc47f2b17353ae9e1c6ad25 100644
--- a/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
+++ b/chrome/browser/ui/intents/web_intent_picker_controller_browsertest.cc
@@ -113,7 +113,7 @@ class WebIntentPickerMock : public WebIntentPicker,
}
// WebIntentPicker implementation.
- virtual void Close() OVERRIDE {}
+ virtual void Close() OVERRIDE { StopWaiting(); }
virtual void SetActionString(const string16& action) OVERRIDE {}
virtual void OnExtensionInstallSuccess(const std::string& id) OVERRIDE {
num_extensions_installed_++;
@@ -152,8 +152,10 @@ class WebIntentPickerMock : public WebIntentPicker,
void StopWaiting() {
pending_async_completed_ = true;
- if (message_loop_started_)
+ if (message_loop_started_) {
+ message_loop_started_ = false;
MessageLoop::current()->Quit();
+ }
}
int num_installed_services_;
« no previous file with comments | « chrome/browser/ui/intents/web_intent_picker_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698