| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/ptr_util.h" | 9 #include "base/memory/ptr_util.h" |
| 10 #include "base/threading/thread_task_runner_handle.h" | 10 #include "base/threading/thread_task_runner_handle.h" |
| (...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 446 ASSERT_TRUE(RunComponentExtensionTest("startTraining")) << message_; | 446 ASSERT_TRUE(RunComponentExtensionTest("startTraining")) << message_; |
| 447 EXPECT_TRUE(listenerTrue.WaitUntilSatisfied()); | 447 EXPECT_TRUE(listenerTrue.WaitUntilSatisfied()); |
| 448 EXPECT_TRUE(service()->IsTraining()); | 448 EXPECT_TRUE(service()->IsTraining()); |
| 449 | 449 |
| 450 ExtensionTestMessageListener listenerFalse("stop training", false); | 450 ExtensionTestMessageListener listenerFalse("stop training", false); |
| 451 ASSERT_TRUE(RunComponentExtensionTest("stopTraining")) << message_; | 451 ASSERT_TRUE(RunComponentExtensionTest("stopTraining")) << message_; |
| 452 EXPECT_TRUE(listenerFalse.WaitUntilSatisfied()); | 452 EXPECT_TRUE(listenerFalse.WaitUntilSatisfied()); |
| 453 EXPECT_FALSE(service()->IsTraining()); | 453 EXPECT_FALSE(service()->IsTraining()); |
| 454 } | 454 } |
| 455 | 455 |
| 456 IN_PROC_BROWSER_TEST_F(HotwordPrivateApiTest, OnSpeakerModelSaved) { | 456 // Flaky on ChromeOS (https://crbug.com/668335) |
| 457 #if defined(OS_CHROMEOS) |
| 458 #define MAYBE_OnSpeakerModelSaved DISABLED_OnSpeakerModelSaved |
| 459 #else |
| 460 #define MAYBE_OnSpeakerModelSaved OnSpeakerModelSaved |
| 461 #endif |
| 462 |
| 463 IN_PROC_BROWSER_TEST_F(HotwordPrivateApiTest, MAYBE_OnSpeakerModelSaved) { |
| 457 extensions::HotwordPrivateEventService::GetFactoryInstance(); | 464 extensions::HotwordPrivateEventService::GetFactoryInstance(); |
| 458 ExtensionTestMessageListener listener("ready", false); | 465 ExtensionTestMessageListener listener("ready", false); |
| 459 ASSERT_TRUE( | 466 ASSERT_TRUE( |
| 460 LoadExtensionAsComponent(test_data_dir_.AppendASCII( | 467 LoadExtensionAsComponent(test_data_dir_.AppendASCII( |
| 461 "onSpeakerModelSaved"))); | 468 "onSpeakerModelSaved"))); |
| 462 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 469 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 463 | 470 |
| 464 ExtensionTestMessageListener listenerNotification("notification", false); | 471 ExtensionTestMessageListener listenerNotification("notification", false); |
| 465 EXPECT_TRUE(listenerNotification.WaitUntilSatisfied()); | 472 EXPECT_TRUE(listenerNotification.WaitUntilSatisfied()); |
| 466 } | 473 } |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 540 ExtensionTestMessageListener setListenerF("set AH False: false failure", | 547 ExtensionTestMessageListener setListenerF("set AH False: false failure", |
| 541 false); | 548 false); |
| 542 ExtensionTestMessageListener getListener("get AH: false failure", false); | 549 ExtensionTestMessageListener getListener("get AH: false failure", false); |
| 543 | 550 |
| 544 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; | 551 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; |
| 545 | 552 |
| 546 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); | 553 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); |
| 547 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); | 554 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); |
| 548 EXPECT_TRUE(getListener.WaitUntilSatisfied()); | 555 EXPECT_TRUE(getListener.WaitUntilSatisfied()); |
| 549 } | 556 } |
| OLD | NEW |