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

Unified Diff: content/test/layouttest_support.cc

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent 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 | « content/test/image_decoder_test.cc ('k') | content/test/net/url_request_abort_on_end_job.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/layouttest_support.cc
diff --git a/content/test/layouttest_support.cc b/content/test/layouttest_support.cc
index 1ebc609607331e36466620dee8b1de573aa6eabe..0ee74c336b185ef9902323f6b4fda56e80f1a46e 100644
--- a/content/test/layouttest_support.cc
+++ b/content/test/layouttest_support.cc
@@ -121,11 +121,10 @@ void EnableWebTestProxyCreation(
RenderFrameImpl::InstallCreateHook(CreateWebFrameTestProxy);
}
-void FetchManifestDoneCallback(
- scoped_ptr<ManifestFetcher> fetcher,
- const FetchManifestCallback& callback,
- const blink::WebURLResponse& response,
- const std::string& data) {
+void FetchManifestDoneCallback(std::unique_ptr<ManifestFetcher> fetcher,
+ const FetchManifestCallback& callback,
+ const blink::WebURLResponse& response,
+ const std::string& data) {
// |fetcher| will be autodeleted here as it is going out of scope.
callback.Run(response, data);
}
@@ -133,7 +132,7 @@ void FetchManifestDoneCallback(
void FetchManifest(blink::WebView* view, const GURL& url,
const FetchManifestCallback& callback) {
ManifestFetcher* fetcher = new ManifestFetcher(url);
- scoped_ptr<ManifestFetcher> autodeleter(fetcher);
+ std::unique_ptr<ManifestFetcher> autodeleter(fetcher);
// Start is called on fetcher which is also bound to the callback.
// A raw pointer is used instead of a scoped_ptr as base::Passes passes
@@ -146,7 +145,7 @@ void FetchManifest(blink::WebView* view, const GURL& url,
callback));
}
-void SetMockGamepadProvider(scoped_ptr<RendererGamepadProvider> provider) {
+void SetMockGamepadProvider(std::unique_ptr<RendererGamepadProvider> provider) {
RenderThreadImpl::current()
->blink_platform_impl()
->SetPlatformEventObserverForTesting(blink::WebPlatformEventTypeGamepad,
@@ -443,7 +442,7 @@ std::string DumpBackForwardList(std::vector<PageState>& page_state,
std::string result;
result.append("\n============== Back Forward List ==============\n");
for (size_t index = 0; index < page_state.size(); ++index) {
- scoped_ptr<HistoryEntry> entry(
+ std::unique_ptr<HistoryEntry> entry(
PageStateToHistoryEntry(page_state[index]));
result.append(
DumpHistoryItem(entry->root_history_node(),
« no previous file with comments | « content/test/image_decoder_test.cc ('k') | content/test/net/url_request_abort_on_end_job.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698