OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" | 5 #include "chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h" |
6 | 6 |
7 #include <deque> | 7 #include <deque> |
8 | 8 |
9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
10 #include "base/json/json_value_converter.h" | 10 #include "base/json/json_value_converter.h" |
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
225 Message entry; | 225 Message entry; |
226 entry.type = type; | 226 entry.type = type; |
227 entry.message = type != extensions::NOTIFICATION_EXTENSION_TEST_PASSED | 227 entry.message = type != extensions::NOTIFICATION_EXTENSION_TEST_PASSED |
228 ? *content::Details<std::string>(details).ptr() | 228 ? *content::Details<std::string>(details).ptr() |
229 : std::string(); | 229 : std::string(); |
230 entry.function = | 230 entry.function = |
231 type == extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE | 231 type == extensions::NOTIFICATION_EXTENSION_TEST_MESSAGE |
232 ? content::Source<extensions::TestSendMessageFunction>(source).ptr() | 232 ? content::Source<extensions::TestSendMessageFunction>(source).ptr() |
233 : NULL; | 233 : NULL; |
234 messages_.push_back(entry); | 234 messages_.push_back(entry); |
235 base::MessageLoopForUI::current()->Quit(); | 235 base::MessageLoopForUI::current()->QuitWhenIdle(); |
236 } | 236 } |
237 | 237 |
238 private: | 238 private: |
239 std::deque<Message> messages_; | 239 std::deque<Message> messages_; |
240 content::NotificationRegistrar registrar_; | 240 content::NotificationRegistrar registrar_; |
241 }; | 241 }; |
242 | 242 |
243 } // anonymous namespace | 243 } // anonymous namespace |
244 | 244 |
245 // The local volume class for test. | 245 // The local volume class for test. |
(...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
723 } | 723 } |
724 | 724 |
725 drive::DriveIntegrationService* | 725 drive::DriveIntegrationService* |
726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { | 726 FileManagerBrowserTestBase::CreateDriveIntegrationService(Profile* profile) { |
727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); | 727 drive_volumes_[profile->GetOriginalProfile()].reset(new DriveTestVolume()); |
728 return drive_volumes_[profile->GetOriginalProfile()] | 728 return drive_volumes_[profile->GetOriginalProfile()] |
729 ->CreateDriveIntegrationService(profile); | 729 ->CreateDriveIntegrationService(profile); |
730 } | 730 } |
731 | 731 |
732 } // namespace file_manager | 732 } // namespace file_manager |
OLD | NEW |