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

Side by Side Diff: components/safe_json/safe_json_parser_impl.h

Issue 1948303002: Re-land: Convert the utility process JSON parser into a Mojo service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 #ifndef COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_ 5 #ifndef COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_
6 #define COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_ 6 #define COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 10
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ref_counted.h" 12 #include "base/memory/ref_counted.h"
13 #include "base/memory/weak_ptr.h"
14 #include "base/threading/thread_checker.h"
15 #include "components/safe_json/public/interfaces/safe_json.mojom.h"
13 #include "components/safe_json/safe_json_parser.h" 16 #include "components/safe_json/safe_json_parser.h"
14 #include "content/public/browser/utility_process_host_client.h" 17 #include "content/public/browser/utility_process_host_client.h"
15 18
16 namespace base { 19 namespace base {
17 class ListValue; 20 class ListValue;
18 class SequencedTaskRunner; 21 class SequencedTaskRunner;
19 class Value; 22 class Value;
20 } 23 }
21 24
25 namespace content {
26 class UtilityProcessHost;
27 }
28
22 namespace IPC { 29 namespace IPC {
23 class Message; 30 class Message;
24 } 31 }
25 32
26 namespace safe_json { 33 namespace safe_json {
27 34
28 class SafeJsonParserImpl : public content::UtilityProcessHostClient, 35 class SafeJsonParserImpl : public content::UtilityProcessHostClient,
29 public SafeJsonParser { 36 public SafeJsonParser {
30 public: 37 public:
31 SafeJsonParserImpl(const std::string& unsafe_json, 38 SafeJsonParserImpl(const std::string& unsafe_json,
32 const SuccessCallback& success_callback, 39 const SuccessCallback& success_callback,
33 const ErrorCallback& error_callback); 40 const ErrorCallback& error_callback);
34 41
35 private: 42 private:
36 ~SafeJsonParserImpl() override; 43 ~SafeJsonParserImpl() override;
37 44
38 void StartWorkOnIOThread(); 45 void StartWorkOnIOThread();
39 46
40 void OnJSONParseSucceeded(const base::ListValue& wrapper);
41 void OnJSONParseFailed(const std::string& error_message);
42
43 void ReportResults(); 47 void ReportResults();
44 void ReportResultsOnOriginThread(); 48 void ReportResultsOnOriginThread();
45 49
46 // Implementing pieces of the UtilityProcessHostClient interface. 50 // Implementing pieces of the UtilityProcessHostClient interface.
47 bool OnMessageReceived(const IPC::Message& message) override; 51 bool OnMessageReceived(const IPC::Message& message) override;
48 52
49 // SafeJsonParser implementation. 53 // SafeJsonParser implementation.
50 void Start() override; 54 void Start() override;
51 55
56 // mojom::SafeJsonParser::Parse callback.
57 void OnParseDone(const base::ListValue& wrapper, mojo::String error);
58
52 const std::string unsafe_json_; 59 const std::string unsafe_json_;
53 SuccessCallback success_callback_; 60 SuccessCallback success_callback_;
54 ErrorCallback error_callback_; 61 ErrorCallback error_callback_;
55 scoped_refptr<base::SequencedTaskRunner> caller_task_runner_; 62 scoped_refptr<base::SequencedTaskRunner> caller_task_runner_;
56 63
57 std::unique_ptr<base::Value> parsed_json_; 64 std::unique_ptr<base::Value> parsed_json_;
58 std::string error_; 65 std::string error_;
59 66
67 base::WeakPtr<content::UtilityProcessHost> utility_process_host_;
68
69 mojom::SafeJsonParserPtr service_;
70
71 // To ensure the UtilityProcessHost and Mojo service are only accessed on the
72 // IO thread.
73 base::ThreadChecker io_thread_checker_;
74
60 DISALLOW_COPY_AND_ASSIGN(SafeJsonParserImpl); 75 DISALLOW_COPY_AND_ASSIGN(SafeJsonParserImpl);
61 }; 76 };
62 77
63 } // namespace safe_json 78 } // namespace safe_json
64 79
65 #endif // COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_ 80 #endif // COMPONENTS_SAFE_JSON_SAFE_JSON_PARSER_IMPL_H_
OLDNEW
« no previous file with comments | « components/safe_json/public/interfaces/safe_json.typemap ('k') | components/safe_json/safe_json_parser_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698