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

Side by Side Diff: content/browser/dom_storage/dom_storage_context_wrapper.cc

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "content/browser/dom_storage/dom_storage_context_wrapper.h" 5 #include "content/browser/dom_storage/dom_storage_context_wrapper.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/bind_helpers.h" 11 #include "base/bind_helpers.h"
12 #include "base/files/file_path.h" 12 #include "base/files/file_path.h"
13 #include "base/location.h" 13 #include "base/location.h"
14 #include "base/memory/ptr_util.h"
14 #include "base/memory/weak_ptr.h" 15 #include "base/memory/weak_ptr.h"
15 #include "base/single_thread_task_runner.h" 16 #include "base/single_thread_task_runner.h"
16 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
17 #include "base/thread_task_runner_handle.h" 18 #include "base/thread_task_runner_handle.h"
18 #include "components/filesystem/public/interfaces/directory.mojom.h" 19 #include "components/filesystem/public/interfaces/directory.mojom.h"
19 #include "components/leveldb/public/interfaces/leveldb.mojom.h" 20 #include "components/leveldb/public/interfaces/leveldb.mojom.h"
20 #include "components/profile_service/public/interfaces/profile.mojom.h" 21 #include "components/profile_service/public/interfaces/profile.mojom.h"
21 #include "content/browser/dom_storage/dom_storage_area.h" 22 #include "content/browser/dom_storage/dom_storage_area.h"
22 #include "content/browser/dom_storage/dom_storage_context_impl.h" 23 #include "content/browser/dom_storage/dom_storage_context_impl.h"
23 #include "content/browser/dom_storage/dom_storage_task_runner.h" 24 #include "content/browser/dom_storage/dom_storage_task_runner.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 void OnDirectoryOpened(filesystem::FileError err); 98 void OnDirectoryOpened(filesystem::FileError err);
98 void OnDatabaseOpened(leveldb::DatabaseError status); 99 void OnDatabaseOpened(leveldb::DatabaseError status);
99 100
100 // The (possibly delayed) implementation of OpenLocalStorage(). Can be called 101 // The (possibly delayed) implementation of OpenLocalStorage(). Can be called
101 // directly from that function, or through |on_database_open_callbacks_|. 102 // directly from that function, or through |on_database_open_callbacks_|.
102 void BindLocalStorage(const url::Origin& origin, 103 void BindLocalStorage(const url::Origin& origin,
103 mojom::LevelDBObserverPtr observer, 104 mojom::LevelDBObserverPtr observer,
104 mojom::LevelDBWrapperRequest request); 105 mojom::LevelDBWrapperRequest request);
105 106
106 // Maps between an origin and its prefixed LevelDB view. 107 // Maps between an origin and its prefixed LevelDB view.
107 std::map<url::Origin, scoped_ptr<LevelDBWrapperImpl>> level_db_wrappers_; 108 std::map<url::Origin, std::unique_ptr<LevelDBWrapperImpl>> level_db_wrappers_;
108 109
109 std::string mojo_user_id_; 110 std::string mojo_user_id_;
110 base::FilePath subdirectory_; 111 base::FilePath subdirectory_;
111 112
112 enum ConnectionState { 113 enum ConnectionState {
113 NO_CONNECTION, 114 NO_CONNECTION,
114 CONNECTION_IN_PROGRESS, 115 CONNECTION_IN_PROGRESS,
115 CONNECTION_FINISHED 116 CONNECTION_FINISHED
116 } connection_state_; 117 } connection_state_;
117 118
118 scoped_ptr<MojoAppConnection> profile_app_connection_; 119 std::unique_ptr<MojoAppConnection> profile_app_connection_;
119 profile::ProfileServicePtr profile_service_; 120 profile::ProfileServicePtr profile_service_;
120 filesystem::DirectoryPtr directory_; 121 filesystem::DirectoryPtr directory_;
121 122
122 leveldb::LevelDBServicePtr leveldb_service_; 123 leveldb::LevelDBServicePtr leveldb_service_;
123 leveldb::LevelDBDatabasePtr database_; 124 leveldb::LevelDBDatabasePtr database_;
124 125
125 std::vector<base::Closure> on_database_opened_callbacks_; 126 std::vector<base::Closure> on_database_opened_callbacks_;
126 127
127 base::WeakPtrFactory<MojoState> weak_ptr_factory_; 128 base::WeakPtrFactory<MojoState> weak_ptr_factory_;
128 }; 129 };
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 on_database_opened_callbacks_[i].Run(); 209 on_database_opened_callbacks_[i].Run();
209 on_database_opened_callbacks_.clear(); 210 on_database_opened_callbacks_.clear();
210 } 211 }
211 212
212 void DOMStorageContextWrapper::MojoState::BindLocalStorage( 213 void DOMStorageContextWrapper::MojoState::BindLocalStorage(
213 const url::Origin& origin, 214 const url::Origin& origin,
214 mojom::LevelDBObserverPtr observer, 215 mojom::LevelDBObserverPtr observer,
215 mojom::LevelDBWrapperRequest request) { 216 mojom::LevelDBWrapperRequest request) {
216 auto found = level_db_wrappers_.find(origin); 217 auto found = level_db_wrappers_.find(origin);
217 if (found == level_db_wrappers_.end()) { 218 if (found == level_db_wrappers_.end()) {
218 level_db_wrappers_[origin] = make_scoped_ptr(new LevelDBWrapperImpl( 219 level_db_wrappers_[origin] = base::WrapUnique(new LevelDBWrapperImpl(
219 database_.get(), 220 database_.get(), origin.Serialize(),
220 origin.Serialize(),
221 kPerStorageAreaQuota + kPerStorageAreaOverQuotaAllowance, 221 kPerStorageAreaQuota + kPerStorageAreaOverQuotaAllowance,
222 base::Bind(&MojoState::OnLevelDDWrapperHasNoBindings, 222 base::Bind(&MojoState::OnLevelDDWrapperHasNoBindings,
223 base::Unretained(this), 223 base::Unretained(this), origin)));
224 origin)));
225 found = level_db_wrappers_.find(origin); 224 found = level_db_wrappers_.find(origin);
226 } 225 }
227 226
228 found->second->Bind(std::move(request)); 227 found->second->Bind(std::move(request));
229 found->second->AddObserver(std::move(observer)); 228 found->second->AddObserver(std::move(observer));
230 } 229 }
231 230
232 DOMStorageContextWrapper::DOMStorageContextWrapper( 231 DOMStorageContextWrapper::DOMStorageContextWrapper(
233 const std::string& mojo_user_id, 232 const std::string& mojo_user_id,
234 const base::FilePath& profile_path, 233 const base::FilePath& profile_path,
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
344 343
345 void DOMStorageContextWrapper::OpenLocalStorage( 344 void DOMStorageContextWrapper::OpenLocalStorage(
346 const url::Origin& origin, 345 const url::Origin& origin,
347 mojom::LevelDBObserverPtr observer, 346 mojom::LevelDBObserverPtr observer,
348 mojom::LevelDBWrapperRequest request) { 347 mojom::LevelDBWrapperRequest request) {
349 mojo_state_->OpenLocalStorage( 348 mojo_state_->OpenLocalStorage(
350 origin, std::move(observer), std::move(request)); 349 origin, std::move(observer), std::move(request));
351 } 350 }
352 351
353 } // namespace content 352 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/dom_storage/dom_storage_context_wrapper.h ('k') | content/browser/dom_storage/dom_storage_database.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698