Return unique_ptr<WebDataConsumerHandle::Reader> directly from obtainReader

third_party/WebKit/Source/modules/fetch/FetchDataConsumerHandle.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef FetchDataConsumerHandle_h
 #define FetchDataConsumerHandle_h
 
 #include "modules/ModulesExport.h"
 #include "platform/blob/BlobData.h"
 #include "platform/network/EncodedFormData.h"
@@ skipping 45 matching lines @@
         // return a non-null blob handle with unspecified size.
         // The type of the returned handle may not be meaningful.
         virtual PassRefPtr<BlobDataHandle> drainAsBlobDataHandle(BlobSizePolicy = DisallowBlobWithInvalidSize) { return nullptr; }
 
         // Drains the data as an EncodedFormData.
         // This function returns a non-null form data when the handle is made
         // from an EncodedFormData-convertible value.
         virtual PassRefPtr<EncodedFormData> drainAsFormData() { return nullptr; }
     };
 
-    // TODO(yhirano): obtainReader() is currently non-virtual override, and
-    // will be changed into virtual override when we can use unique_ptr in
-    // Blink.
-    std::unique_ptr<Reader> obtainReader(Client* client) { return wrapUnique(obtainReaderInternal(client)); }
-
-private:
-    Reader* obtainReaderInternal(Client*) override = 0;
+    std::unique_ptr<WebDataConsumerHandle::Reader> obtainReader(Client*) final;
+    virtual std::unique_ptr<Reader> obtainFetchDataReader(Client*) = 0;
 };
 
 } // namespace blink
 
 #endif // FetchDataConsumerHandle_h