| Index: extensions/browser/api/web_request/form_data_parser.cc
|
| diff --git a/extensions/browser/api/web_request/form_data_parser.cc b/extensions/browser/api/web_request/form_data_parser.cc
|
| index f81c109956494103657035025daf1d5bcc6bcf4b..6966e431b82cd8d7158911af59cad9cd1261befc 100644
|
| --- a/extensions/browser/api/web_request/form_data_parser.cc
|
| +++ b/extensions/browser/api/web_request/form_data_parser.cc
|
| @@ -296,7 +296,7 @@ FormDataParser::Result::~Result() {}
|
| FormDataParser::~FormDataParser() {}
|
|
|
| // static
|
| -scoped_ptr<FormDataParser> FormDataParser::Create(
|
| +std::unique_ptr<FormDataParser> FormDataParser::Create(
|
| const net::URLRequest& request) {
|
| std::string value;
|
| const bool found = request.extra_request_headers().GetHeader(
|
| @@ -305,7 +305,7 @@ scoped_ptr<FormDataParser> FormDataParser::Create(
|
| }
|
|
|
| // static
|
| -scoped_ptr<FormDataParser> FormDataParser::CreateFromContentTypeHeader(
|
| +std::unique_ptr<FormDataParser> FormDataParser::CreateFromContentTypeHeader(
|
| const std::string* content_type_header) {
|
| enum ParserChoice {URL_ENCODED, MULTIPART, ERROR_CHOICE};
|
| ParserChoice choice = ERROR_CHOICE;
|
| @@ -326,7 +326,7 @@ scoped_ptr<FormDataParser> FormDataParser::CreateFromContentTypeHeader(
|
| size_t offset = content_type_header->find(kBoundaryString);
|
| if (offset == std::string::npos) {
|
| // Malformed header.
|
| - return scoped_ptr<FormDataParser>();
|
| + return std::unique_ptr<FormDataParser>();
|
| }
|
| offset += sizeof(kBoundaryString) - 1;
|
| boundary = content_type_header->substr(
|
| @@ -339,14 +339,15 @@ scoped_ptr<FormDataParser> FormDataParser::CreateFromContentTypeHeader(
|
|
|
| switch (choice) {
|
| case URL_ENCODED:
|
| - return scoped_ptr<FormDataParser>(new FormDataParserUrlEncoded());
|
| + return std::unique_ptr<FormDataParser>(new FormDataParserUrlEncoded());
|
| case MULTIPART:
|
| - return scoped_ptr<FormDataParser>(new FormDataParserMultipart(boundary));
|
| + return std::unique_ptr<FormDataParser>(
|
| + new FormDataParserMultipart(boundary));
|
| case ERROR_CHOICE:
|
| - return scoped_ptr<FormDataParser>();
|
| + return std::unique_ptr<FormDataParser>();
|
| }
|
| NOTREACHED(); // Some compilers do not believe this is unreachable.
|
| - return scoped_ptr<FormDataParser>();
|
| + return std::unique_ptr<FormDataParser>();
|
| }
|
|
|
| FormDataParser::FormDataParser() {}
|
|
|