Index: chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc |
diff --git a/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc b/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc |
index 07f7563d345f9c9da83395a0c98e0df2a579f7d9..a76a663bfac2f7b4b7a77ae78dc0ee481716825b 100644 |
--- a/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc |
+++ b/chrome/browser/chromeos/file_system_provider/operations/get_actions_unittest.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/chromeos/file_system_provider/operations/get_actions.h" |
+#include <memory> |
#include <string> |
#include <utility> |
#include <vector> |
@@ -12,7 +13,6 @@ |
#include "base/files/file_path.h" |
#include "base/json/json_reader.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "base/memory/scoped_vector.h" |
#include "base/values.h" |
#include "chrome/browser/chromeos/file_system_provider/operations/get_metadata.h" |
@@ -72,19 +72,19 @@ class CallbackLogger { |
// Returns the request value as |result| in case of successful parse. |
void CreateRequestValueFromJSON(const std::string& json, |
- scoped_ptr<RequestValue>* result) { |
+ std::unique_ptr<RequestValue>* result) { |
using extensions::api::file_system_provider_internal:: |
GetActionsRequestedSuccess::Params; |
int json_error_code; |
std::string json_error_msg; |
- scoped_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( |
+ std::unique_ptr<base::Value> value = base::JSONReader::ReadAndReturnError( |
json, base::JSON_PARSE_RFC, &json_error_code, &json_error_msg); |
ASSERT_TRUE(value.get()) << json_error_msg; |
base::ListValue* value_as_list; |
ASSERT_TRUE(value->GetAsList(&value_as_list)); |
- scoped_ptr<Params> params(Params::Create(*value_as_list)); |
+ std::unique_ptr<Params> params(Params::Create(*value_as_list)); |
ASSERT_TRUE(params.get()); |
*result = RequestValue::CreateForGetActionsSuccess(std::move(params)); |
ASSERT_TRUE(result->get()); |
@@ -196,7 +196,7 @@ TEST_F(FileSystemProviderOperationsGetActionsTest, OnSuccess) { |
" ],\n" |
" 0\n" // execution_time |
"]\n"; |
- scoped_ptr<RequestValue> request_value; |
+ std::unique_ptr<RequestValue> request_value; |
ASSERT_NO_FATAL_FAILURE(CreateRequestValueFromJSON(input, &request_value)); |
const bool has_more = false; |
@@ -233,7 +233,8 @@ TEST_F(FileSystemProviderOperationsGetActionsTest, OnError) { |
EXPECT_TRUE(get_actions.Execute(kRequestId)); |
- get_actions.OnError(kRequestId, scoped_ptr<RequestValue>(new RequestValue()), |
+ get_actions.OnError(kRequestId, |
+ std::unique_ptr<RequestValue>(new RequestValue()), |
base::File::FILE_ERROR_TOO_MANY_OPENED); |
ASSERT_EQ(1u, callback_logger.events().size()); |