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

Side by Side Diff: content/browser/renderer_host/media/media_stream_manager_unittest.cc

Issue 276993002: Revert 269271 "Mac Video Capture Device: split VCD into VCD and ..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1984/src/
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
11 #include "content/browser/browser_thread_impl.h" 11 #include "content/browser/browser_thread_impl.h"
12 #include "content/browser/renderer_host/media/media_stream_manager.h" 12 #include "content/browser/renderer_host/media/media_stream_manager.h"
13 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 13 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
14 #include "content/common/media/media_stream_options.h" 14 #include "content/common/media/media_stream_options.h"
15 #include "content/public/common/content_switches.h" 15 #include "content/public/common/content_switches.h"
16 #include "content/public/test/test_browser_thread_bundle.h" 16 #include "content/public/test/test_browser_thread_bundle.h"
17 #include "media/audio/audio_manager_base.h" 17 #include "media/audio/audio_manager_base.h"
18 #include "media/audio/fake_audio_log_factory.h" 18 #include "media/audio/fake_audio_log_factory.h"
19 #include "media/base/media_switches.h"
20 #include "testing/gmock/include/gmock/gmock.h" 19 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 20 #include "testing/gtest/include/gtest/gtest.h"
22 21
23 #if defined(USE_ALSA) 22 #if defined(USE_ALSA)
24 #include "media/audio/alsa/audio_manager_alsa.h" 23 #include "media/audio/alsa/audio_manager_alsa.h"
25 #elif defined(OS_ANDROID) 24 #elif defined(OS_ANDROID)
26 #include "media/audio/android/audio_manager_android.h" 25 #include "media/audio/android/audio_manager_android.h"
27 #elif defined(OS_MACOSX) 26 #elif defined(OS_MACOSX)
28 #include "media/audio/mac/audio_manager_mac.h" 27 #include "media/audio/mac/audio_manager_mac.h"
29 #elif defined(OS_WIN) 28 #elif defined(OS_WIN)
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
174 std::string label2 = MakeMediaAccessRequest(1); 173 std::string label2 = MakeMediaAccessRequest(1);
175 media_stream_manager_->CancelRequest(label1); 174 media_stream_manager_->CancelRequest(label1);
176 175
177 // Expecting the callback from the second request will be triggered and 176 // Expecting the callback from the second request will be triggered and
178 // quit the test. 177 // quit the test.
179 EXPECT_CALL(*this, Response(1)); 178 EXPECT_CALL(*this, Response(1));
180 run_loop_.Run(); 179 run_loop_.Run();
181 } 180 }
182 181
183 } // namespace content 182 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698