| OLD | NEW |
| 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 <stddef.h> | 5 #include <stddef.h> |
| 6 | 6 |
| 7 #include "base/json/json_writer.h" | 7 #include "base/json/json_writer.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 bool* audio_playing, | 71 bool* audio_playing, |
| 72 const RenderProcessHost::AudioOutputControllerList& list) { | 72 const RenderProcessHost::AudioOutputControllerList& list) { |
| 73 if (!list.empty()) | 73 if (!list.empty()) |
| 74 *audio_playing = true; | 74 *audio_playing = true; |
| 75 } | 75 } |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 class WebrtcAudioPrivateTest : public AudioWaitingExtensionTest { | 78 class WebrtcAudioPrivateTest : public AudioWaitingExtensionTest { |
| 79 public: | 79 public: |
| 80 WebrtcAudioPrivateTest() | 80 WebrtcAudioPrivateTest() |
| 81 : enumeration_event_(false, false) { | 81 : enumeration_event_(base::WaitableEvent::ResetPolicy::AUTOMATIC, |
| 82 } | 82 base::WaitableEvent::InitialState::NOT_SIGNALED) {} |
| 83 | 83 |
| 84 void SetUpOnMainThread() override { | 84 void SetUpOnMainThread() override { |
| 85 AudioWaitingExtensionTest::SetUpOnMainThread(); | 85 AudioWaitingExtensionTest::SetUpOnMainThread(); |
| 86 // Needs to happen after chrome's schemes are added. | 86 // Needs to happen after chrome's schemes are added. |
| 87 source_url_ = GURL("chrome-extension://fakeid012345678/fakepage.html"); | 87 source_url_ = GURL("chrome-extension://fakeid012345678/fakepage.html"); |
| 88 } | 88 } |
| 89 | 89 |
| 90 protected: | 90 protected: |
| 91 void AppendTabIdToRequestInfo(base::ListValue* params, int tab_id) { | 91 void AppendTabIdToRequestInfo(base::ListValue* params, int tab_id) { |
| 92 base::DictionaryValue* request_info = new base::DictionaryValue(); | 92 base::DictionaryValue* request_info = new base::DictionaryValue(); |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 426 title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure")); | 426 title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("failure")); |
| 427 base::string16 result = title_watcher.WaitAndGetTitle(); | 427 base::string16 result = title_watcher.WaitAndGetTitle(); |
| 428 EXPECT_EQ(base::ASCIIToUTF16("success"), result); | 428 EXPECT_EQ(base::ASCIIToUTF16("success"), result); |
| 429 | 429 |
| 430 g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting( | 430 g_browser_process->webrtc_log_uploader()->OverrideUploadWithBufferForTesting( |
| 431 NULL); | 431 NULL); |
| 432 } | 432 } |
| 433 #endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTEN
SION) | 433 #endif // defined(GOOGLE_CHROME_BUILD) || defined(ENABLE_HANGOUT_SERVICES_EXTEN
SION) |
| 434 | 434 |
| 435 } // namespace extensions | 435 } // namespace extensions |
| OLD | NEW |