summaryrefslogtreecommitdiff
path: root/chromium/components/safe_json/testing_json_parser_unittest.cc
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-07-14 17:41:05 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-08-04 12:37:36 +0000
commit399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch)
tree6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/components/safe_json/testing_json_parser_unittest.cc
parent7366110654eec46f21b6824f302356426f48cd74 (diff)
downloadqtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4 Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/components/safe_json/testing_json_parser_unittest.cc')
-rw-r--r--chromium/components/safe_json/testing_json_parser_unittest.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/chromium/components/safe_json/testing_json_parser_unittest.cc b/chromium/components/safe_json/testing_json_parser_unittest.cc
index 20ad6413466..1e944a98fa2 100644
--- a/chromium/components/safe_json/testing_json_parser_unittest.cc
+++ b/chromium/components/safe_json/testing_json_parser_unittest.cc
@@ -4,6 +4,8 @@
#include "components/safe_json/testing_json_parser.h"
+#include <memory>
+
#include "base/bind.h"
#include "base/callback.h"
#include "base/message_loop/message_loop.h"
@@ -34,7 +36,7 @@ class TestingJsonParserTest : public testing::Test {
private:
static void SuccessCallback(TestingJsonParserTest* test,
base::Closure quit_closure,
- scoped_ptr<base::Value> value) {
+ std::unique_ptr<base::Value> value) {
test->did_success_ = true;
quit_closure.Run();