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

Side by Side Diff: media/mojo/services/media_mojo_unittest.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 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 | « media/mojo/services/main.cc ('k') | media/mojo/services/mojo_media_application.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 <stdint.h> 5 #include <stdint.h>
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/callback.h" 11 #include "base/callback.h"
12 #include "base/macros.h" 12 #include "base/macros.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "media/base/cdm_config.h" 14 #include "media/base/cdm_config.h"
15 #include "media/base/mock_filters.h" 15 #include "media/base/mock_filters.h"
16 #include "media/base/test_helpers.h" 16 #include "media/base/test_helpers.h"
17 #include "media/mojo/clients/mojo_demuxer_stream_impl.h" 17 #include "media/mojo/clients/mojo_demuxer_stream_impl.h"
18 #include "media/mojo/common/media_type_converters.h" 18 #include "media/mojo/common/media_type_converters.h"
19 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 19 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
20 #include "media/mojo/interfaces/decryptor.mojom.h" 20 #include "media/mojo/interfaces/decryptor.mojom.h"
21 #include "media/mojo/interfaces/renderer.mojom.h" 21 #include "media/mojo/interfaces/renderer.mojom.h"
22 #include "media/mojo/interfaces/service_factory.mojom.h" 22 #include "media/mojo/interfaces/service_factory.mojom.h"
23 #include "mojo/public/cpp/bindings/associated_binding.h" 23 #include "mojo/public/cpp/bindings/associated_binding.h"
24 #include "services/shell/public/cpp/service_test.h" 24 #include "services/service_manager/public/cpp/service_test.h"
25 #include "testing/gmock/include/gmock/gmock.h" 25 #include "testing/gmock/include/gmock/gmock.h"
26 26
27 using testing::Exactly; 27 using testing::Exactly;
28 using testing::Invoke; 28 using testing::Invoke;
29 using testing::InvokeWithoutArgs; 29 using testing::InvokeWithoutArgs;
30 using testing::StrictMock; 30 using testing::StrictMock;
31 31
32 namespace media { 32 namespace media {
33 namespace { 33 namespace {
34 34
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 // close the connection. 196 // close the connection.
197 EXPECT_CALL(*this, ConnectionClosed()) 197 EXPECT_CALL(*this, ConnectionClosed())
198 .Times(Exactly(1)) 198 .Times(Exactly(1))
199 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit)); 199 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
200 service_factory_.reset(); 200 service_factory_.reset();
201 201
202 run_loop_->Run(); 202 run_loop_->Run();
203 } 203 }
204 204
205 } // namespace media 205 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/main.cc ('k') | media/mojo/services/mojo_media_application.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698