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

Unified Diff: chrome/browser/chromeos/policy/upload_job_impl.h

Issue 1870793002: Convert //chrome/browser/chromeos from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/upload_job.h ('k') | chrome/browser/chromeos/policy/upload_job_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/policy/upload_job_impl.h
diff --git a/chrome/browser/chromeos/policy/upload_job_impl.h b/chrome/browser/chromeos/policy/upload_job_impl.h
index 7c7106f25b4747cf461745a2d92be2c246289ebb..96d7df125759418c052398d7dc0c212bc6076341 100644
--- a/chrome/browser/chromeos/policy/upload_job_impl.h
+++ b/chrome/browser/chromeos/policy/upload_job_impl.h
@@ -6,11 +6,11 @@
#define CHROME_BROWSER_CHROMEOS_POLICY_UPLOAD_JOB_IMPL_H_
#include <map>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/memory/scoped_vector.h"
#include "chrome/browser/chromeos/policy/upload_job.h"
#include "google_apis/gaia/oauth2_token_service.h"
@@ -54,14 +54,14 @@ class UploadJobImpl : public UploadJob,
OAuth2TokenService* token_service,
scoped_refptr<net::URLRequestContextGetter> url_context_getter,
Delegate* delegate,
- scoped_ptr<MimeBoundaryGenerator> boundary_generator);
+ std::unique_ptr<MimeBoundaryGenerator> boundary_generator);
~UploadJobImpl() override;
// UploadJob:
void AddDataSegment(const std::string& name,
const std::string& filename,
const std::map<std::string, std::string>& header_entries,
- scoped_ptr<std::string> data) override;
+ std::unique_ptr<std::string> data) override;
void Start() override;
private:
@@ -121,28 +121,28 @@ class UploadJobImpl : public UploadJob,
// An implementation of MimeBoundaryGenerator. This instance will be used to
// generate MIME boundaries when assembling the multipart request in
// SetUpMultipart().
- scoped_ptr<MimeBoundaryGenerator> boundary_generator_;
+ std::unique_ptr<MimeBoundaryGenerator> boundary_generator_;
// Current state the uploader is in.
State state_;
// Contains the cached MIME boundary.
- scoped_ptr<std::string> mime_boundary_;
+ std::unique_ptr<std::string> mime_boundary_;
// Contains the cached, encoded post data.
- scoped_ptr<std::string> post_data_;
+ std::unique_ptr<std::string> post_data_;
// Keeps track of the number of retries.
int retry_;
// The OAuth request to receive the access token.
- scoped_ptr<OAuth2TokenService::Request> access_token_request_;
+ std::unique_ptr<OAuth2TokenService::Request> access_token_request_;
// The OAuth access token.
std::string access_token_;
// Helper to upload the data.
- scoped_ptr<net::URLFetcher> upload_fetcher_;
+ std::unique_ptr<net::URLFetcher> upload_fetcher_;
// The data chunks to be uploaded.
ScopedVector<DataSegment> data_segments_;
« no previous file with comments | « chrome/browser/chromeos/policy/upload_job.h ('k') | chrome/browser/chromeos/policy/upload_job_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698