| 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 361 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 372 ASSERT_TRUE( | 372 ASSERT_TRUE( |
| 373 LoadExtensionAsComponent(test_data_dir_.AppendASCII( | 373 LoadExtensionAsComponent(test_data_dir_.AppendASCII( |
| 374 "onHotwordTriggered"))); | 374 "onHotwordTriggered"))); |
| 375 EXPECT_TRUE(listener.WaitUntilSatisfied()); | 375 EXPECT_TRUE(listener.WaitUntilSatisfied()); |
| 376 | 376 |
| 377 ExtensionTestMessageListener listenerNotification("notification", false); | 377 ExtensionTestMessageListener listenerNotification("notification", false); |
| 378 service()->NotifyHotwordTriggered(); | 378 service()->NotifyHotwordTriggered(); |
| 379 EXPECT_TRUE(listenerNotification.WaitUntilSatisfied()); | 379 EXPECT_TRUE(listenerNotification.WaitUntilSatisfied()); |
| 380 } | 380 } |
| 381 | 381 |
| 382 IN_PROC_BROWSER_TEST_F(HotwordPrivateApiTest, OnDeleteSpeakerModel) { | 382 #if defined(OS_LINUX) |
| 383 #define MAYBE_OnDeleteSpeakerModel DISABLED_OnDeleteSpeakerModel |
| 384 #else |
| 385 #define MAYBE_OnDeleteSpeakerModel OnDeleteSpeakerModel |
| 386 #endif |
| 387 IN_PROC_BROWSER_TEST_F(HotwordPrivateApiTest, MAYBE_OnDeleteSpeakerModel) { |
| 383 MockWebHistoryService* web_history = new MockWebHistoryService(profile()); | 388 MockWebHistoryService* web_history = new MockWebHistoryService(profile()); |
| 384 MockAudioHistoryHandler* handler = | 389 MockAudioHistoryHandler* handler = |
| 385 new MockAudioHistoryHandler(profile(), web_history); | 390 new MockAudioHistoryHandler(profile(), web_history); |
| 386 service()->SetAudioHistoryHandler(handler); | 391 service()->SetAudioHistoryHandler(handler); |
| 387 web_history->SetExpectedValue(false); | 392 web_history->SetExpectedValue(false); |
| 388 profile()->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled, true); | 393 profile()->GetPrefs()->SetBoolean(prefs::kHotwordAlwaysOnSearchEnabled, true); |
| 389 | 394 |
| 390 // Trigger the pref registrar. | 395 // Trigger the pref registrar. |
| 391 extensions::HotwordPrivateEventService::GetFactoryInstance(); | 396 extensions::HotwordPrivateEventService::GetFactoryInstance(); |
| 392 ExtensionTestMessageListener listener("ready", false); | 397 ExtensionTestMessageListener listener("ready", false); |
| (...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 535 ExtensionTestMessageListener setListenerF("set AH False: false failure", | 540 ExtensionTestMessageListener setListenerF("set AH False: false failure", |
| 536 false); | 541 false); |
| 537 ExtensionTestMessageListener getListener("get AH: false failure", false); | 542 ExtensionTestMessageListener getListener("get AH: false failure", false); |
| 538 | 543 |
| 539 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; | 544 ASSERT_TRUE(RunComponentExtensionTest("audioHistory")) << message_; |
| 540 | 545 |
| 541 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); | 546 EXPECT_TRUE(setListenerT.WaitUntilSatisfied()); |
| 542 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); | 547 EXPECT_TRUE(setListenerF.WaitUntilSatisfied()); |
| 543 EXPECT_TRUE(getListener.WaitUntilSatisfied()); | 548 EXPECT_TRUE(getListener.WaitUntilSatisfied()); |
| 544 } | 549 } |
| OLD | NEW |