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

Side by Side Diff: content/browser/streams/stream_context.h

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
« no previous file with comments | « content/browser/streams/stream.cc ('k') | content/browser/streams/stream_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #ifndef CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_ 5 #ifndef CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_
6 #define CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_ 6 #define CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_
7 7
8 #include <memory>
9
8 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
9 #include "base/memory/scoped_ptr.h"
10 #include "base/sequenced_task_runner_helpers.h" 11 #include "base/sequenced_task_runner_helpers.h"
11 #include "content/common/content_export.h" 12 #include "content/common/content_export.h"
12 13
13 namespace content { 14 namespace content {
14 class BrowserContext; 15 class BrowserContext;
15 class StreamRegistry; 16 class StreamRegistry;
16 struct StreamContextDeleter; 17 struct StreamContextDeleter;
17 18
18 // A context class that keeps track of StreamRegistry used by the chrome. 19 // A context class that keeps track of StreamRegistry used by the chrome.
19 // There is an instance associated with each BrowserContext. There could be 20 // There is an instance associated with each BrowserContext. There could be
(...skipping 18 matching lines...) Expand all
38 virtual ~StreamContext(); 39 virtual ~StreamContext();
39 40
40 private: 41 private:
41 friend class base::DeleteHelper<StreamContext>; 42 friend class base::DeleteHelper<StreamContext>;
42 friend class base::RefCountedThreadSafe<StreamContext, 43 friend class base::RefCountedThreadSafe<StreamContext,
43 StreamContextDeleter>; 44 StreamContextDeleter>;
44 friend struct StreamContextDeleter; 45 friend struct StreamContextDeleter;
45 46
46 void DeleteOnCorrectThread() const; 47 void DeleteOnCorrectThread() const;
47 48
48 scoped_ptr<StreamRegistry> registry_; 49 std::unique_ptr<StreamRegistry> registry_;
49 }; 50 };
50 51
51 struct StreamContextDeleter { 52 struct StreamContextDeleter {
52 static void Destruct(const StreamContext* context) { 53 static void Destruct(const StreamContext* context) {
53 context->DeleteOnCorrectThread(); 54 context->DeleteOnCorrectThread();
54 } 55 }
55 }; 56 };
56 57
57 } // namespace content 58 } // namespace content
58 59
59 #endif // CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_ 60 #endif // CONTENT_BROWSER_STREAMS_STREAM_CONTEXT_H_
OLDNEW
« no previous file with comments | « content/browser/streams/stream.cc ('k') | content/browser/streams/stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698