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

Unified Diff: third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp

Issue 2172183003: Return unique_ptr<WebDataConsumerHandle::Reader> directly from obtainReader (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@gmock_cxx11
Patch Set: rebase Created 4 years, 5 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
Index: third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp
diff --git a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp
index 705da2c16543557d703846749f3a05787db6dd93..ac28f5d7bcd0ccd2bb26c71f1753a905de73a401 100644
--- a/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp
+++ b/third_party/WebKit/Source/modules/fetch/DataConsumerHandleUtil.cpp
@@ -34,7 +34,7 @@ private:
return UnexpectedError;
}
};
- Reader* obtainReaderInternal(Client*) override { return new ReaderImpl; }
+ std::unique_ptr<Reader> obtainReader(Client*) override { return WTF::wrapUnique(new ReaderImpl); }
const char* debugName() const override { return "WaitingHandle"; }
};
@@ -61,13 +61,13 @@ private:
class DoneHandle final : public WebDataConsumerHandle {
private:
- Reader* obtainReaderInternal(Client* client) override { return new RepeatingReader(Done, client); }
+ std::unique_ptr<Reader> obtainReader(Client* client) override { return WTF::wrapUnique(new RepeatingReader(Done, client)); }
const char* debugName() const override { return "DoneHandle"; }
};
class UnexpectedErrorHandle final : public WebDataConsumerHandle {
private:
- Reader* obtainReaderInternal(Client* client) override { return new RepeatingReader(UnexpectedError, client); }
+ std::unique_ptr<Reader> obtainReader(Client* client) override { return WTF::wrapUnique(new RepeatingReader(UnexpectedError, client)); }
const char* debugName() const override { return "UnexpectedErrorHandle"; }
};
@@ -95,7 +95,10 @@ private:
std::unique_ptr<WebDataConsumerHandle::Reader> m_reader;
};
- Reader* obtainReaderInternal(Client* client) override { return new ReaderImpl(m_handle->obtainReader(client)); }
+ std::unique_ptr<Reader> obtainFetchDataReader(Client* client) override
+ {
+ return WTF::wrapUnique(new ReaderImpl(m_handle->obtainReader(client)));
+ }
const char* debugName() const override { return m_handle->debugName(); }

Powered by Google App Engine
This is Rietveld 408576698