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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.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/file_manager/file_manager_browsertest_base.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index a56bd384bf76892e97ce870458e7bdf6f5b94e18..abc7a0fbf9372e038e147ae5df30d6bc71b79a00 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -229,10 +229,12 @@ class FileManagerTestListener : public content::NotificationObserver {
entry.message = type != extensions::NOTIFICATION_EXTENSION_TEST_PASSED
? *content::Details<std::string>(details).ptr()
: std::string();
- entry.function =
- type == extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE
- ? content::Source<extensions::TestSendMessageFunction>(source).ptr()
- : NULL;
+ if (type == extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE) {
+ entry.function =
+ content::Source<extensions::TestSendMessageFunction>(source).ptr();
+ *content::Details<std::pair<std::string, bool*>>(details).ptr()->second =
+ true;
+ }
messages_.push_back(entry);
base::MessageLoopForUI::current()->QuitWhenIdle();
}
@@ -584,8 +586,10 @@ void FileManagerBrowserTestBase::RunTestMessageLoop() {
const base::DictionaryValue* message_dictionary = NULL;
std::string name;
if (!value || !value->GetAsDictionary(&message_dictionary) ||
- !message_dictionary->GetString("name", &name))
+ !message_dictionary->GetString("name", &name)) {
+ entry.function->Reply(std::string());
continue;
+ }
std::string output;
OnMessage(name, *message_dictionary, &output);

Powered by Google App Engine
This is Rietveld 408576698