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

Side by Side Diff: chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc

Issue 1278473003: Disabling a flaky WebrtcAudioPrivateTest.TriggerEvent test on Windows, ChromeOS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabling on CrOS as well. Created 5 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/json/json_writer.h" 5 #include "base/json/json_writer.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "base/synchronization/waitable_event.h" 9 #include "base/synchronization/waitable_event.h"
10 #include "base/threading/platform_thread.h" 10 #include "base/threading/platform_thread.h"
(...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after
350 scoped_ptr<base::Value> result( 350 scoped_ptr<base::Value> result(
351 RunFunctionAndReturnSingleResult(function.get(), 351 RunFunctionAndReturnSingleResult(function.get(),
352 parameter_string, 352 parameter_string,
353 browser())); 353 browser()));
354 std::string result_string; 354 std::string result_string;
355 JSONWriter::Write(*result, &result_string); 355 JSONWriter::Write(*result, &result_string);
356 VLOG(2) << "Results: " << result_string; 356 VLOG(2) << "Results: " << result_string;
357 } 357 }
358 } 358 }
359 359
360 IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, TriggerEvent) { 360 // Times out frequently on Windows, CrOS: http://crbug.com/517112
361 #if defined(OS_WIN) || defined(OS_CHROMEOS)
362 #define MAYBE_TriggerEvent DISABLED_TriggerEvent
363 #else
364 #define MAYBE_TriggerEvent TriggerEvent
365 #endif
366
367 IN_PROC_BROWSER_TEST_F(WebrtcAudioPrivateTest, MAYBE_TriggerEvent) {
361 WebrtcAudioPrivateEventService* service = 368 WebrtcAudioPrivateEventService* service =
362 WebrtcAudioPrivateEventService::GetFactoryInstance()->Get(profile()); 369 WebrtcAudioPrivateEventService::GetFactoryInstance()->Get(profile());
363 370
364 // Just trigger, without any extension listening. 371 // Just trigger, without any extension listening.
365 service->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO_CAPTURE); 372 service->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO_CAPTURE);
366 373
367 // Now load our test extension and do it again. 374 // Now load our test extension and do it again.
368 const extensions::Extension* extension = LoadExtension( 375 const extensions::Extension* extension = LoadExtension(
369 test_data_dir_.AppendASCII("webrtc_audio_private_event_listener")); 376 test_data_dir_.AppendASCII("webrtc_audio_private_event_listener"));
370 service->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO_CAPTURE); 377 service->OnDevicesChanged(base::SystemMonitor::DEVTYPE_AUDIO_CAPTURE);
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure")); 424 title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure"));
418 base::string16 result = title_watcher.WaitAndGetTitle(); 425 base::string16 result = title_watcher.WaitAndGetTitle();
419 EXPECT_EQ(base::ASCIIToUTF16("success"), result); 426 EXPECT_EQ(base::ASCIIToUTF16("success"), result);
420 427
421 g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting( 428 g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting(
422 NULL); 429 NULL);
423 } 430 }
424 #endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTEN SION) 431 #endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTEN SION)
425 432
426 } // namespace extensions 433 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698