| Index: components/test_runner/web_frame_test_proxy.h
|
| diff --git a/components/test_runner/web_frame_test_proxy.h b/components/test_runner/web_frame_test_proxy.h
|
| index ce58447b8cef30cb23bb814e6bcaf5d2469d6edd..7e7c1a12c5322664b13f64ed9d2588933468eb1e 100644
|
| --- a/components/test_runner/web_frame_test_proxy.h
|
| +++ b/components/test_runner/web_frame_test_proxy.h
|
| @@ -5,28 +5,34 @@
|
| #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
|
| #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
|
|
|
| +#include <utility>
|
| +
|
| #include "base/logging.h"
|
| #include "base/macros.h"
|
| +#include "base/memory/scoped_ptr.h"
|
| +#include "components/test_runner/test_runner_export.h"
|
| +#include "components/test_runner/web_frame_test_client.h"
|
| #include "third_party/WebKit/public/platform/WebString.h"
|
| #include "third_party/WebKit/public/web/WebFrameClient.h"
|
| #include "third_party/WebKit/public/web/WebLocalFrame.h"
|
|
|
| namespace test_runner {
|
|
|
| -class WebFrameTestProxyBase {
|
| +class TEST_RUNNER_EXPORT WebFrameTestProxyBase {
|
| public:
|
| - void set_test_client(blink::WebFrameClient* client) {
|
| + void set_test_client(scoped_ptr<WebFrameTestClient> client) {
|
| DCHECK(client);
|
| DCHECK(!test_client_);
|
| - test_client_ = client;
|
| + test_client_ = std::move(client);
|
| }
|
|
|
| protected:
|
| - WebFrameTestProxyBase() : test_client_(nullptr) {}
|
| - blink::WebFrameClient* test_client() { return test_client_; }
|
| + WebFrameTestProxyBase();
|
| + ~WebFrameTestProxyBase();
|
| + blink::WebFrameClient* test_client() { return test_client_.get(); }
|
|
|
| private:
|
| - blink::WebFrameClient* test_client_;
|
| + scoped_ptr<WebFrameTestClient> test_client_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxyBase);
|
| };
|
|
|