| Index: third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
|
| diff --git a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
|
| index d41105eb0ace1b1a450d0e581f0263cf870e14e3..8ca88848740cf577852019f223b68643833b14fd 100644
|
| --- a/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
|
| +++ b/third_party/WebKit/Source/modules/websockets/DOMWebSocketTest.cpp
|
| @@ -18,10 +18,10 @@
|
| #include "public/platform/WebInsecureRequestPolicy.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "wtf/OwnPtr.h"
|
| #include "wtf/Vector.h"
|
| #include "wtf/text/CString.h"
|
| #include "wtf/text/WTFString.h"
|
| +#include <memory>
|
| #include <v8.h>
|
|
|
| using testing::_;
|
| @@ -52,19 +52,19 @@ public:
|
| MOCK_METHOD3(send, void(const DOMArrayBuffer&, unsigned, unsigned));
|
| MOCK_METHOD1(send, void(PassRefPtr<BlobDataHandle>));
|
| MOCK_METHOD1(sendTextAsCharVectorMock, void(Vector<char>*));
|
| - void sendTextAsCharVector(PassOwnPtr<Vector<char>> vector)
|
| + void sendTextAsCharVector(std::unique_ptr<Vector<char>> vector)
|
| {
|
| sendTextAsCharVectorMock(vector.get());
|
| }
|
| MOCK_METHOD1(sendBinaryAsCharVectorMock, void(Vector<char>*));
|
| - void sendBinaryAsCharVector(PassOwnPtr<Vector<char>> vector)
|
| + void sendBinaryAsCharVector(std::unique_ptr<Vector<char>> vector)
|
| {
|
| sendBinaryAsCharVectorMock(vector.get());
|
| }
|
| MOCK_CONST_METHOD0(bufferedAmount, unsigned());
|
| MOCK_METHOD2(close, void(int, const String&));
|
| MOCK_METHOD3(failMock, void(const String&, MessageLevel, SourceLocation*));
|
| - void fail(const String& reason, MessageLevel level, PassOwnPtr<SourceLocation> location)
|
| + void fail(const String& reason, MessageLevel level, std::unique_ptr<SourceLocation> location)
|
| {
|
| failMock(reason, level, location.get());
|
| }
|
|
|