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

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

Issue 19618002: Use a direct include of the message_loop header in content/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "content/browser/browser_thread_impl.h" 10 #include "content/browser/browser_thread_impl.h"
11 #include "content/browser/renderer_host/media/media_stream_manager.h" 11 #include "content/browser/renderer_host/media/media_stream_manager.h"
12 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" 12 #include "content/browser/renderer_host/media/media_stream_ui_proxy.h"
13 #include "content/common/media/media_stream_options.h" 13 #include "content/common/media/media_stream_options.h"
14 #include "content/public/test/test_browser_thread_bundle.h" 14 #include "content/public/test/test_browser_thread_bundle.h"
15 #include "media/audio/audio_manager_base.h" 15 #include "media/audio/audio_manager_base.h"
16 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "media/audio/android/audio_manager_android.h" 17 #include "media/audio/android/audio_manager_android.h"
18 #elif defined(OS_LINUX) || defined(OS_OPENBSD) 18 #elif defined(OS_LINUX) || defined(OS_OPENBSD)
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 std::string label2 = MakeMediaAccessRequest(1); 165 std::string label2 = MakeMediaAccessRequest(1);
166 media_stream_manager_->CancelRequest(label1); 166 media_stream_manager_->CancelRequest(label1);
167 167
168 // Expecting the callback from the second request will be triggered and 168 // Expecting the callback from the second request will be triggered and
169 // quit the test. 169 // quit the test.
170 EXPECT_CALL(*this, Response(1)); 170 EXPECT_CALL(*this, Response(1));
171 run_loop_.Run(); 171 run_loop_.Run();
172 } 172 }
173 173
174 } // namespace content 174 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698