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

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

Issue 1544313002: Convert Pass()→std::move() in //media (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_promise.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 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 "media/mojo/services/mojo_cdm_factory.h" 5 #include "media/mojo/services/mojo_cdm_factory.h"
6 6
7 #include <utility>
8
7 #include "base/bind.h" 9 #include "base/bind.h"
8 #include "base/location.h" 10 #include "base/location.h"
9 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
10 #include "base/thread_task_runner_handle.h" 12 #include "base/thread_task_runner_handle.h"
11 #include "media/base/key_systems.h" 13 #include "media/base/key_systems.h"
12 #include "media/cdm/aes_decryptor.h" 14 #include "media/cdm/aes_decryptor.h"
13 #include "media/mojo/interfaces/service_factory.mojom.h" 15 #include "media/mojo/interfaces/service_factory.mojom.h"
14 #include "media/mojo/services/mojo_cdm.h" 16 #include "media/mojo/services/mojo_cdm.h"
15 #include "mojo/application/public/cpp/connect.h" 17 #include "mojo/application/public/cpp/connect.h"
16 #include "mojo/public/cpp/bindings/interface_request.h" 18 #include "mojo/public/cpp/bindings/interface_request.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 new AesDecryptor(security_origin, session_message_cb, session_closed_cb, 51 new AesDecryptor(security_origin, session_message_cb, session_closed_cb,
50 session_keys_change_cb)); 52 session_keys_change_cb));
51 base::ThreadTaskRunnerHandle::Get()->PostTask( 53 base::ThreadTaskRunnerHandle::Get()->PostTask(
52 FROM_HERE, base::Bind(cdm_created_cb, cdm, "")); 54 FROM_HERE, base::Bind(cdm_created_cb, cdm, ""));
53 return; 55 return;
54 } 56 }
55 57
56 interfaces::ContentDecryptionModulePtr cdm_ptr; 58 interfaces::ContentDecryptionModulePtr cdm_ptr;
57 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr)); 59 service_factory_->CreateCdm(mojo::GetProxy(&cdm_ptr));
58 60
59 MojoCdm::Create(key_system, security_origin, cdm_config, cdm_ptr.Pass(), 61 MojoCdm::Create(key_system, security_origin, cdm_config, std::move(cdm_ptr),
60 session_message_cb, session_closed_cb, 62 session_message_cb, session_closed_cb,
61 legacy_session_error_cb, session_keys_change_cb, 63 legacy_session_error_cb, session_keys_change_cb,
62 session_expiration_update_cb, cdm_created_cb); 64 session_expiration_update_cb, cdm_created_cb);
63 } 65 }
64 66
65 } // namespace media 67 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_cdm.cc ('k') | media/mojo/services/mojo_cdm_promise.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698