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

Side by Side Diff: media/cdm/ppapi/external_clear_key/clear_key_cdm.cc

Issue 868753004: Mechanical rename of tracing includes for /media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part2
Patch Set: Created 5 years, 11 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/cast/sender/video_sender.cc ('k') | media/filters/decoder_stream.cc » ('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 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 "media/cdm/ppapi/external_clear_key/clear_key_cdm.h" 5 #include "media/cdm/ppapi/external_clear_key/clear_key_cdm.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cstring> 8 #include <cstring>
9 #include <sstream> 9 #include <sstream>
10 #include <string> 10 #include <string>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/debug/trace_event.h"
15 #include "base/logging.h" 14 #include "base/logging.h"
16 #include "base/stl_util.h" 15 #include "base/stl_util.h"
17 #include "base/time/time.h" 16 #include "base/time/time.h"
17 #include "base/trace_event/trace_event.h"
18 #include "media/base/cdm_callback_promise.h" 18 #include "media/base/cdm_callback_promise.h"
19 #include "media/base/cdm_key_information.h" 19 #include "media/base/cdm_key_information.h"
20 #include "media/base/decoder_buffer.h" 20 #include "media/base/decoder_buffer.h"
21 #include "media/base/decrypt_config.h" 21 #include "media/base/decrypt_config.h"
22 #include "media/cdm/json_web_key.h" 22 #include "media/cdm/json_web_key.h"
23 #include "media/cdm/ppapi/cdm_file_io_test.h" 23 #include "media/cdm/ppapi/cdm_file_io_test.h"
24 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h" 24 #include "media/cdm/ppapi/external_clear_key/cdm_video_decoder.h"
25 25
26 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER) 26 #if defined(CLEAR_KEY_CDM_USE_FAKE_AUDIO_DECODER)
27 #include "base/basictypes.h" 27 #include "base/basictypes.h"
(...skipping 869 matching lines...) Expand 10 before | Expand all | Expand 10 after
897 void ClearKeyCdm::OnFileIOTestComplete(bool success) { 897 void ClearKeyCdm::OnFileIOTestComplete(bool success) {
898 DVLOG(1) << __FUNCTION__ << ": " << success; 898 DVLOG(1) << __FUNCTION__ << ": " << success;
899 std::string message = GetFileIOTestResultMessage(success); 899 std::string message = GetFileIOTestResultMessage(success);
900 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(), 900 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(),
901 cdm::kLicenseRequest, message.data(), 901 cdm::kLicenseRequest, message.data(),
902 message.length(), NULL, 0); 902 message.length(), NULL, 0);
903 file_io_test_runner_.reset(); 903 file_io_test_runner_.reset();
904 } 904 }
905 905
906 } // namespace media 906 } // namespace media
OLDNEW
« no previous file with comments | « media/cast/sender/video_sender.cc ('k') | media/filters/decoder_stream.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698