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

Side by Side Diff: sync/internal_api/public/attachments/attachment_uploader_impl.h

Issue 458753006: Fix use after free bug by calling GetTokenService in Core's ctor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Update TSP comment (CANDIDATE). Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 #ifndef SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_ 5 #ifndef SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_
6 #define SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_ 6 #define SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_
7 7
8 #include "base/containers/scoped_ptr_hash_map.h" 8 #include "base/containers/scoped_ptr_hash_map.h"
9 #include "base/threading/non_thread_safe.h" 9 #include "base/threading/non_thread_safe.h"
10 #include "google_apis/gaia/oauth2_token_service_request.h" 10 #include "google_apis/gaia/oauth2_token_service_request.h"
(...skipping 20 matching lines...) Expand all
31 // 31 //
32 // |scopes| is the set of scopes to use for uploads. 32 // |scopes| is the set of scopes to use for uploads.
33 // 33 //
34 // |token_service_provider| provides an OAuth2 token service. 34 // |token_service_provider| provides an OAuth2 token service.
35 AttachmentUploaderImpl( 35 AttachmentUploaderImpl(
36 const GURL& sync_service_url, 36 const GURL& sync_service_url,
37 const scoped_refptr<net::URLRequestContextGetter>& 37 const scoped_refptr<net::URLRequestContextGetter>&
38 url_request_context_getter, 38 url_request_context_getter,
39 const std::string& account_id, 39 const std::string& account_id,
40 const OAuth2TokenService::ScopeSet& scopes, 40 const OAuth2TokenService::ScopeSet& scopes,
41 scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider> 41 const scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>&
42 token_service_provider); 42 token_service_provider);
43 virtual ~AttachmentUploaderImpl(); 43 virtual ~AttachmentUploaderImpl();
44 44
45 // AttachmentUploader implementation. 45 // AttachmentUploader implementation.
46 virtual void UploadAttachment(const Attachment& attachment, 46 virtual void UploadAttachment(const Attachment& attachment,
47 const UploadCallback& callback) OVERRIDE; 47 const UploadCallback& callback) OVERRIDE;
48 48
49 // Return the URL for the given |sync_service_url| and |attachment_id|. 49 // Return the URL for the given |sync_service_url| and |attachment_id|.
50 static GURL GetURLForAttachmentId(const GURL& sync_service_url, 50 static GURL GetURLForAttachmentId(const GURL& sync_service_url,
51 const AttachmentId& attachment_id); 51 const AttachmentId& attachment_id);
52 52
53 private: 53 private:
54 class UploadState; 54 class UploadState;
55 typedef std::string UniqueId; 55 typedef std::string UniqueId;
56 typedef base::ScopedPtrHashMap<UniqueId, UploadState> StateMap; 56 typedef base::ScopedPtrHashMap<UniqueId, UploadState> StateMap;
57 57
58 void DeleteUploadStateFor(const UniqueId& unique_id); 58 void DeleteUploadStateFor(const UniqueId& unique_id);
59 59
60 GURL sync_service_url_; 60 GURL sync_service_url_;
61 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_; 61 scoped_refptr<net::URLRequestContextGetter> url_request_context_getter_;
62 std::string account_id_; 62 std::string account_id_;
63 OAuth2TokenService::ScopeSet scopes_; 63 OAuth2TokenService::ScopeSet scopes_;
64 scoped_ptr<OAuth2TokenServiceRequest::TokenServiceProvider> 64 scoped_refptr<OAuth2TokenServiceRequest::TokenServiceProvider>
65 token_service_provider_; 65 token_service_provider_;
66 StateMap state_map_; 66 StateMap state_map_;
67 DISALLOW_COPY_AND_ASSIGN(AttachmentUploaderImpl); 67 DISALLOW_COPY_AND_ASSIGN(AttachmentUploaderImpl);
68 }; 68 };
69 69
70 } // namespace syncer 70 } // namespace syncer
71 71
72 #endif // SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_ 72 #endif // SYNC_INTERNAL_API_PUBLIC_ATTACHMENTS_ATTACHMENT_UPLOADER_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698