| 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);
|
|
|