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

Side by Side Diff: webkit/tools/test_shell/simple_dom_storage_system.cc

Issue 16155009: Update webkit/ to use scoped_refptr<T>::get() rather than implicit "operator T*" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "webkit/tools/test_shell/simple_dom_storage_system.h" 5 #include "webkit/tools/test_shell/simple_dom_storage_system.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "googleurl/src/gurl.h" 8 #include "googleurl/src/gurl.h"
9 #include "third_party/WebKit/public/platform/WebStorageArea.h" 9 #include "third_party/WebKit/public/platform/WebStorageArea.h"
10 #include "third_party/WebKit/public/platform/WebStorageNamespace.h" 10 #include "third_party/WebKit/public/platform/WebStorageNamespace.h"
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this); 187 base::AutoReset<AreaImpl*> auto_reset(&parent_->area_being_processed_, this);
188 Host()->ClearArea(connection_id_, pageUrl); 188 Host()->ClearArea(connection_id_, pageUrl);
189 } 189 }
190 190
191 // SimpleDomStorageSystem ----------------------------- 191 // SimpleDomStorageSystem -----------------------------
192 192
193 SimpleDomStorageSystem* SimpleDomStorageSystem::g_instance_; 193 SimpleDomStorageSystem* SimpleDomStorageSystem::g_instance_;
194 194
195 SimpleDomStorageSystem::SimpleDomStorageSystem() 195 SimpleDomStorageSystem::SimpleDomStorageSystem()
196 : weak_factory_(this), 196 : weak_factory_(this),
197 context_(new DomStorageContext(base::FilePath(), base::FilePath(), 197 context_(new DomStorageContext(base::FilePath(),
198 NULL, NULL)), 198 base::FilePath(),
199 host_(new DomStorageHost(context_)), 199 NULL,
200 NULL)),
201 host_(new DomStorageHost(context_.get())),
200 area_being_processed_(NULL), 202 area_being_processed_(NULL),
201 next_connection_id_(1) { 203 next_connection_id_(1) {
202 DCHECK(!g_instance_); 204 DCHECK(!g_instance_);
203 g_instance_ = this; 205 g_instance_ = this;
204 context_->AddEventObserver(this); 206 context_->AddEventObserver(this);
205 } 207 }
206 208
207 SimpleDomStorageSystem::~SimpleDomStorageSystem() { 209 SimpleDomStorageSystem::~SimpleDomStorageSystem() {
208 g_instance_ = NULL; 210 g_instance_ = NULL;
209 host_.reset(); 211 host_.reset();
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 key, 277 key,
276 old_value, 278 old_value,
277 new_value, 279 new_value,
278 area->origin(), 280 area->origin(),
279 page_url, 281 page_url,
280 session_namespace_for_event_dispatch, 282 session_namespace_for_event_dispatch,
281 area_being_processed_, 283 area_being_processed_,
282 true /* originatedInProcess */); 284 true /* originatedInProcess */);
283 } 285 }
284 } 286 }
OLDNEW
« no previous file with comments | « webkit/support/test_webmessageportchannel.cc ('k') | webkit/tools/test_shell/simple_file_system.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698