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

Side by Side Diff: media/blink/cdm_session_adapter.cc

Issue 1965273003: Fix include path for moved thread_task_runner_handle.h header in media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_move_task_runner_handle
Patch Set: merge up to r393009 Created 4 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
« no previous file with comments | « media/base/serial_runner.cc ('k') | media/blink/webcontentdecryptionmoduleaccess_impl.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/blink/cdm_session_adapter.h" 5 #include "media/blink/cdm_session_adapter.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/stl_util.h" 12 #include "base/stl_util.h"
13 #include "base/thread_task_runner_handle.h" 13 #include "base/threading/thread_task_runner_handle.h"
14 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
15 #include "media/base/cdm_factory.h" 15 #include "media/base/cdm_factory.h"
16 #include "media/base/cdm_key_information.h" 16 #include "media/base/cdm_key_information.h"
17 #include "media/base/cdm_promise.h" 17 #include "media/base/cdm_promise.h"
18 #include "media/base/key_systems.h" 18 #include "media/base/key_systems.h"
19 #include "media/blink/webcontentdecryptionmodule_impl.h" 19 #include "media/blink/webcontentdecryptionmodule_impl.h"
20 #include "media/blink/webcontentdecryptionmodulesession_impl.h" 20 #include "media/blink/webcontentdecryptionmodulesession_impl.h"
21 #include "url/gurl.h" 21 #include "url/gurl.h"
22 22
23 namespace media { 23 namespace media {
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
248 // Note: This leaks memory, which is expected behavior. 248 // Note: This leaks memory, which is expected behavior.
249 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet( 249 base::HistogramBase* histogram = base::Histogram::FactoryTimeGet(
250 GetKeySystemUMAPrefix() + kTimeToCreateCdmUMAName, 250 GetKeySystemUMAPrefix() + kTimeToCreateCdmUMAName,
251 base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(10), 251 base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromSeconds(10),
252 50, base::HistogramBase::kUmaTargetedHistogramFlag); 252 50, base::HistogramBase::kUmaTargetedHistogramFlag);
253 253
254 histogram->AddTime(time); 254 histogram->AddTime(time);
255 } 255 }
256 256
257 } // namespace media 257 } // namespace media
OLDNEW
« no previous file with comments | « media/base/serial_runner.cc ('k') | media/blink/webcontentdecryptionmoduleaccess_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698