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

Side by Side Diff: components/safe_json/json_sanitizer.cc

Issue 1445003002: Use std::default_delete as the default deleter for scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: How many trial and errors before this builds on the Windows bots Created 5 years, 1 month 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 | « components/rappor/byte_vector_utils.cc ('k') | components/safe_json/safe_json_parser_android.h » ('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 "components/safe_json/json_sanitizer.h" 5 #include "components/safe_json/json_sanitizer.h"
6 6
7 #if defined(OS_ANDROID) 7 #if defined(OS_ANDROID)
8 #error Build json_sanitizer_android.cc instead of this file on Android. 8 #error Build json_sanitizer_android.cc instead of this file on Android.
9 #endif 9 #endif
10 10
11 #include <memory>
12
11 #include "base/bind.h" 13 #include "base/bind.h"
12 #include "base/callback.h" 14 #include "base/callback.h"
13 #include "base/json/json_writer.h" 15 #include "base/json/json_writer.h"
14 #include "base/memory/weak_ptr.h" 16 #include "base/memory/weak_ptr.h"
15 #include "base/strings/string_util.h" 17 #include "base/strings/string_util.h"
16 #include "base/values.h" 18 #include "base/values.h"
17 #include "components/safe_json/safe_json_parser.h" 19 #include "components/safe_json/safe_json_parser.h"
18 20
19 namespace safe_json { 21 namespace safe_json {
20 22
21 namespace { 23 namespace {
22 24
23 class OopJsonSanitizer : public JsonSanitizer { 25 class OopJsonSanitizer : public JsonSanitizer {
24 public: 26 public:
25 OopJsonSanitizer(const std::string& unsafe_json, 27 OopJsonSanitizer(const std::string& unsafe_json,
26 const StringCallback& success_callback, 28 const StringCallback& success_callback,
27 const StringCallback& error_callback); 29 const StringCallback& error_callback);
28 30
29 private: 31 private:
30 friend struct base::DefaultDeleter<OopJsonSanitizer>; 32 friend std::default_delete<OopJsonSanitizer>;
31 ~OopJsonSanitizer() {} 33 ~OopJsonSanitizer() {}
32 34
33 void OnParseSuccess(scoped_ptr<base::Value> value); 35 void OnParseSuccess(scoped_ptr<base::Value> value);
34 void OnParseError(const std::string& error); 36 void OnParseError(const std::string& error);
35 37
36 StringCallback success_callback_; 38 StringCallback success_callback_;
37 StringCallback error_callback_; 39 StringCallback error_callback_;
38 40
39 DISALLOW_COPY_AND_ASSIGN(OopJsonSanitizer); 41 DISALLOW_COPY_AND_ASSIGN(OopJsonSanitizer);
40 }; 42 };
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 82
81 // static 83 // static
82 void JsonSanitizer::Sanitize(const std::string& unsafe_json, 84 void JsonSanitizer::Sanitize(const std::string& unsafe_json,
83 const StringCallback& success_callback, 85 const StringCallback& success_callback,
84 const StringCallback& error_callback) { 86 const StringCallback& error_callback) {
85 // OopJsonSanitizer destroys itself when it is finished. 87 // OopJsonSanitizer destroys itself when it is finished.
86 new OopJsonSanitizer(unsafe_json, success_callback, error_callback); 88 new OopJsonSanitizer(unsafe_json, success_callback, error_callback);
87 } 89 }
88 90
89 } // namespace safe_json 91 } // namespace safe_json
OLDNEW
« no previous file with comments | « components/rappor/byte_vector_utils.cc ('k') | components/safe_json/safe_json_parser_android.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698