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

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

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
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>
11 #include <vector>
12 10
13 #include "base/bind.h" 11 #include "base/bind.h"
14 #include "base/logging.h" 12 #include "base/logging.h"
15 #include "base/stl_util.h" 13 #include "base/stl_util.h"
16 #include "base/time/time.h" 14 #include "base/time/time.h"
17 #include "base/trace_event/trace_event.h" 15 #include "base/trace_event/trace_event.h"
18 #include "media/base/cdm_callback_promise.h" 16 #include "media/base/cdm_callback_promise.h"
19 #include "media/base/cdm_key_information.h" 17 #include "media/base/cdm_key_information.h"
20 #include "media/base/decoder_buffer.h" 18 #include "media/base/decoder_buffer.h"
21 #include "media/base/decrypt_config.h" 19 #include "media/base/decrypt_config.h"
(...skipping 903 matching lines...) Expand 10 before | Expand all | Expand 10 after
925 void ClearKeyCdm::OnFileIOTestComplete(bool success) { 923 void ClearKeyCdm::OnFileIOTestComplete(bool success) {
926 DVLOG(1) << __FUNCTION__ << ": " << success; 924 DVLOG(1) << __FUNCTION__ << ": " << success;
927 std::string message = GetFileIOTestResultMessage(success); 925 std::string message = GetFileIOTestResultMessage(success);
928 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(), 926 host_->OnSessionMessage(last_session_id_.data(), last_session_id_.length(),
929 cdm::kLicenseRequest, message.data(), 927 cdm::kLicenseRequest, message.data(),
930 message.length(), NULL, 0); 928 message.length(), NULL, 0);
931 file_io_test_runner_.reset(); 929 file_io_test_runner_.reset();
932 } 930 }
933 931
934 } // namespace media 932 } // namespace media
OLDNEW
« no previous file with comments | « media/cdm/ppapi/cdm_logging.cc ('k') | media/cdm/ppapi/external_clear_key/ffmpeg_cdm_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698