content/shell/renderer/test_runner/web_test_proxy.cc - Issue 404373002: test_runner: Migrate MockColorChooser to Chromium C++ style.

Side by Side Diff: content/shell/renderer/test_runner/web_test_proxy.cc

Issue 404373002: test_runner: Migrate MockColorChooser to Chromium C++ style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 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

« no previous file with comments | « content/shell/renderer/test_runner/mock_color_chooser.cc ('k') | no next file » | no next file with comments »

OLD	NEW
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 #include "content/shell/renderer/test_runner/web_test_proxy.h"	5 #include "content/shell/renderer/test_runner/web_test_proxy.h"

6	6

7 #include <cctype>	7 #include <cctype>

8	8

9 #include "base/callback_helpers.h"	9 #include "base/callback_helpers.h"

10 #include "base/debug/trace_event.h"	10 #include "base/debug/trace_event.h"

11 #include "base/logging.h"	11 #include "base/logging.h"

12 #include "content/shell/renderer/test_runner/MockColorChooser.h"

13 #include "content/shell/renderer/test_runner/MockWebSpeechRecognizer.h"	12 #include "content/shell/renderer/test_runner/MockWebSpeechRecognizer.h"

14 #include "content/shell/renderer/test_runner/SpellCheckClient.h"	13 #include "content/shell/renderer/test_runner/SpellCheckClient.h"

15 #include "content/shell/renderer/test_runner/TestCommon.h"	14 #include "content/shell/renderer/test_runner/TestCommon.h"

16 #include "content/shell/renderer/test_runner/TestInterfaces.h"	15 #include "content/shell/renderer/test_runner/TestInterfaces.h"

17 #include "content/shell/renderer/test_runner/TestPlugin.h"	16 #include "content/shell/renderer/test_runner/TestPlugin.h"

18 #include "content/shell/renderer/test_runner/WebTestDelegate.h"	17 #include "content/shell/renderer/test_runner/WebTestDelegate.h"

19 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"	18 #include "content/shell/renderer/test_runner/WebTestInterfaces.h"

20 #include "content/shell/renderer/test_runner/accessibility_controller.h"	19 #include "content/shell/renderer/test_runner/accessibility_controller.h"

21 #include "content/shell/renderer/test_runner/event_sender.h"	20 #include "content/shell/renderer/test_runner/event_sender.h"

	21 #include "content/shell/renderer/test_runner/mock_color_chooser.h"

22 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"	22 #include "content/shell/renderer/test_runner/mock_screen_orientation_client.h"

23 #include "content/shell/renderer/test_runner/mock_web_push_client.h"	23 #include "content/shell/renderer/test_runner/mock_web_push_client.h"

24 #include "content/shell/renderer/test_runner/mock_web_user_media_client.h"	24 #include "content/shell/renderer/test_runner/mock_web_user_media_client.h"

25 #include "content/shell/renderer/test_runner/test_runner.h"	25 #include "content/shell/renderer/test_runner/test_runner.h"

26 #include "content/shell/renderer/test_runner/web_test_runner.h"	26 #include "content/shell/renderer/test_runner/web_test_runner.h"

27 // FIXME: Including platform_canvas.h here is a layering violation.	27 // FIXME: Including platform_canvas.h here is a layering violation.

28 #include "skia/ext/platform_canvas.h"	28 #include "skia/ext/platform_canvas.h"

29 #include "third_party/WebKit/public/platform/WebCString.h"	29 #include "third_party/WebKit/public/platform/WebCString.h"

30 #include "third_party/WebKit/public/platform/WebURLError.h"	30 #include "third_party/WebKit/public/platform/WebURLError.h"

31 #include "third_party/WebKit/public/platform/WebURLRequest.h"	31 #include "third_party/WebKit/public/platform/WebURLRequest.h"

(...skipping 1213 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1245 if (!push_client_.get())	1245 if (!push_client_.get())

1246 push_client_.reset(new MockWebPushClient);	1246 push_client_.reset(new MockWebPushClient);

1247 return push_client_.get();	1247 return push_client_.get();

1248 }	1248 }

1249	1249

1250 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() {	1250 blink::WebPushClient* WebTestProxyBase::GetWebPushClient() {

1251 return GetPushClientMock();	1251 return GetPushClientMock();

1252 }	1252 }

1253	1253

1254 } // namespace content	1254 } // namespace content

OLD	NEW