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: chrome/browser/media/router/discovery/dial/safe_dial_device_description_parser.cc

Issue 2701633002: [Media Router] Add DialMediaSinkService and DeviceDescriptionService (Closed)
Patch Set: resolve code review comments from Mark and Derek Created 3 years, 8 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 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "chrome/browser/media/router/discovery/dial/safe_dial_device_descriptio n_parser.h" 5 #include "chrome/browser/media/router/discovery/dial/safe_dial_device_descriptio n_parser.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "chrome/grit/generated_resources.h" 9 #include "chrome/grit/generated_resources.h"
10 #include "content/public/browser/browser_thread.h" 10 #include "content/public/browser/browser_thread.h"
11 #include "ui/base/l10n/l10n_util.h" 11 #include "ui/base/l10n/l10n_util.h"
12 12
13 namespace media_router { 13 namespace media_router {
14 14
15 SafeDialDeviceDescriptionParser::SafeDialDeviceDescriptionParser() {} 15 SafeDialDeviceDescriptionParser::SafeDialDeviceDescriptionParser()
16 : pending_parsing_requests_(0) {}
16 17
17 SafeDialDeviceDescriptionParser::~SafeDialDeviceDescriptionParser() {} 18 SafeDialDeviceDescriptionParser::~SafeDialDeviceDescriptionParser() {}
18 19
19 void SafeDialDeviceDescriptionParser::Start( 20 void SafeDialDeviceDescriptionParser::Start(
20 const std::string& xml_text, 21 const std::string& xml_text,
21 const DeviceDescriptionCallback& callback) { 22 const DeviceDescriptionCallback& callback) {
23 DVLOG(2) << "Start parsing device description...";
22 DCHECK(thread_checker_.CalledOnValidThread()); 24 DCHECK(thread_checker_.CalledOnValidThread());
23 DCHECK(!utility_process_mojo_client_); 25
24 DCHECK(callback); 26 DCHECK(callback);
25 27
26 device_description_callback_ = callback; 28 if (!utility_process_mojo_client_) {
29 DVLOG(2) << "Start utility process in background...";
30 utility_process_mojo_client_ =
31 base::MakeUnique<content::UtilityProcessMojoClient<
32 chrome::mojom::DialDeviceDescriptionParser>>(
33 l10n_util::GetStringUTF16(
34 IDS_UTILITY_PROCESS_DIAL_DEVICE_DESCRIPTION_PARSER_NAME));
27 35
28 utility_process_mojo_client_ = 36 utility_process_mojo_client_->set_error_callback(base::Bind(
29 base::MakeUnique<content::UtilityProcessMojoClient< 37 &SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionFailed, this,
30 chrome::mojom::DialDeviceDescriptionParser>>( 38 callback));
31 l10n_util::GetStringUTF16(
32 IDS_UTILITY_PROCESS_DIAL_DEVICE_DESCRIPTION_PARSER_NAME));
33 39
34 utility_process_mojo_client_->set_error_callback(base::Bind( 40 // This starts utility process in the background.
35 &SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionFailed, 41 utility_process_mojo_client_->Start();
36 base::Unretained(this))); 42 }
37
38 // This starts utility process in the background.
39 utility_process_mojo_client_->Start();
40 43
41 // This call is queued up until the Mojo message pipe has been established to 44 // This call is queued up until the Mojo message pipe has been established to
42 // the service running in the utility process. 45 // the service running in the utility process.
43 utility_process_mojo_client_->service()->ParseDialDeviceDescription( 46 utility_process_mojo_client_->service()->ParseDialDeviceDescription(
44 xml_text, 47 xml_text,
45 base::Bind( 48 base::Bind(
46 &SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionComplete, 49 &SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionComplete,
47 base::Unretained(this))); 50 this, callback));
51
52 ++pending_parsing_requests_;
48 } 53 }
49 54
50 void SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionComplete( 55 void SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionComplete(
56 const DeviceDescriptionCallback& callback,
51 chrome::mojom::DialDeviceDescriptionPtr device_description) { 57 chrome::mojom::DialDeviceDescriptionPtr device_description) {
52 DCHECK(thread_checker_.CalledOnValidThread()); 58 DCHECK(thread_checker_.CalledOnValidThread());
59 DCHECK(callback);
53 60
54 utility_process_mojo_client_.reset(); // Terminate the utility process. 61 --pending_parsing_requests_;
62 callback.Run(std::move(device_description));
55 63
56 DCHECK(device_description_callback_); 64 if (!pending_parsing_requests_)
57 device_description_callback_.Run(std::move(device_description)); 65 utility_process_mojo_client_.reset(); // Terminate the utility process.
58 } 66 }
59 67
60 void SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionFailed() { 68 void SafeDialDeviceDescriptionParser::OnParseDeviceDescriptionFailed(
69 const DeviceDescriptionCallback& callback) {
61 DCHECK(thread_checker_.CalledOnValidThread()); 70 DCHECK(thread_checker_.CalledOnValidThread());
71 DCHECK(callback);
62 72
63 utility_process_mojo_client_.reset(); // Terminate the utility process. 73 --pending_parsing_requests_;
74 callback.Run(nullptr);
64 75
65 DCHECK(device_description_callback_); 76 if (!pending_parsing_requests_)
66 device_description_callback_.Run(nullptr); 77 utility_process_mojo_client_.reset(); // Terminate the utility process.
67 } 78 }
68 79
69 } // namespace media_router 80 } // namespace media_router
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698