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

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

Issue 1542013004: Switch to standard integer types in media/, take 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more stddef Created 5 years 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
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>
6
5 #include "base/bind.h" 7 #include "base/bind.h"
6 #include "base/callback.h" 8 #include "base/callback.h"
7 #include "base/macros.h" 9 #include "base/macros.h"
8 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
9 #include "base/run_loop.h" 11 #include "base/run_loop.h"
10 #include "media/base/cdm_config.h" 12 #include "media/base/cdm_config.h"
11 #include "media/base/mock_filters.h" 13 #include "media/base/mock_filters.h"
12 #include "media/base/test_helpers.h" 14 #include "media/base/test_helpers.h"
13 #include "media/cdm/key_system_names.h" 15 #include "media/cdm/key_system_names.h"
14 #include "media/mojo/interfaces/content_decryption_module.mojom.h" 16 #include "media/mojo/interfaces/content_decryption_module.mojom.h"
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 // close the connection. 165 // close the connection.
164 EXPECT_CALL(*this, ConnectionClosed()) 166 EXPECT_CALL(*this, ConnectionClosed())
165 .Times(Exactly(1)) 167 .Times(Exactly(1))
166 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit)); 168 .WillOnce(Invoke(run_loop_.get(), &base::RunLoop::Quit));
167 service_factory_.reset(); 169 service_factory_.reset();
168 170
169 run_loop_->Run(); 171 run_loop_->Run();
170 } 172 }
171 173
172 } // namespace media 174 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/demuxer_stream_provider_shim.h ('k') | media/mojo/services/media_type_converters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698