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

Side by Side Diff: components/test_runner/web_frame_test_proxy.h

Issue 2171503005: Rename WebTestProxy to WebViewTestProxy. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 27 matching lines...) Expand all
38 ~WebFrameTestProxyBase(); 38 ~WebFrameTestProxyBase();
39 blink::WebFrameClient* test_client() { return test_client_.get(); } 39 blink::WebFrameClient* test_client() { return test_client_.get(); }
40 40
41 private: 41 private:
42 std::unique_ptr<WebFrameTestClient> test_client_; 42 std::unique_ptr<WebFrameTestClient> test_client_;
43 blink::WebLocalFrame* web_frame_; 43 blink::WebLocalFrame* web_frame_;
44 44
45 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxyBase); 45 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxyBase);
46 }; 46 };
47 47
48 // WebTestProxy is used during LayoutTests and always instantiated, at time of 48 // WebViewTestProxy is used during LayoutTests and always instantiated, at time
Łukasz Anforowicz 2016/07/21 19:14:50 This probably should be changed to WebFrameTestPro
lfg 2016/07/22 04:24:50 Done.
49 // writing with Base=RenderFrameImpl. It does not directly inherit from it for 49 // of writing with Base=RenderFrameImpl. It does not directly inherit from it
50 // layering purposes. 50 // for layering purposes.
51 template <class Base, typename P> 51 template <class Base, typename P>
52 class WebFrameTestProxy : public Base, public WebFrameTestProxyBase { 52 class WebFrameTestProxy : public Base, public WebFrameTestProxyBase {
53 public: 53 public:
54 explicit WebFrameTestProxy(P p) : Base(p) {} 54 explicit WebFrameTestProxy(P p) : Base(p) {}
55 55
56 virtual ~WebFrameTestProxy() {} 56 virtual ~WebFrameTestProxy() {}
57 57
58 // WebFrameClient implementation. 58 // WebFrameClient implementation.
59 blink::WebPlugin* createPlugin( 59 blink::WebPlugin* createPlugin(
60 blink::WebLocalFrame* frame, 60 blink::WebLocalFrame* frame,
(...skipping 235 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 return test_client()->runFileChooser(params, completion); 296 return test_client()->runFileChooser(params, completion);
297 } 297 }
298 298
299 private: 299 private:
300 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 300 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
301 }; 301 };
302 302
303 } // namespace test_runner 303 } // namespace test_runner
304 304
305 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 305 #endif // COMPONENTS_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698