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

Side by Side Diff: content/shell/renderer/shell_content_renderer_client.cc

Issue 17575007: Migrate TestRunner includes to new location (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell_content_renderer_client.h" 5 #include "content/shell/renderer/shell_content_renderer_client.h"
6 6
7 #include "base/callback.h" 7 #include "base/callback.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/debug/debugger.h" 9 #include "base/debug/debugger.h"
10 #include "content/public/common/content_constants.h" 10 #include "content/public/common/content_constants.h"
11 #include "content/public/common/content_switches.h" 11 #include "content/public/common/content_switches.h"
12 #include "content/public/renderer/render_view.h" 12 #include "content/public/renderer/render_view.h"
13 #include "content/public/test/layouttest_support.h" 13 #include "content/public/test/layouttest_support.h"
14 #include "content/shell/common/shell_switches.h" 14 #include "content/shell/common/shell_switches.h"
15 #include "content/shell/renderer/shell_render_process_observer.h" 15 #include "content/shell/renderer/shell_render_process_observer.h"
16 #include "content/shell/renderer/webkit_test_runner.h" 16 #include "content/shell/renderer/webkit_test_runner.h"
17 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h" 17 #include "third_party/WebKit/public/platform/WebMediaStreamCenter.h"
18 #include "third_party/WebKit/public/testing/WebTestInterfaces.h"
19 #include "third_party/WebKit/public/testing/WebTestProxy.h"
20 #include "third_party/WebKit/public/testing/WebTestRunner.h"
18 #include "third_party/WebKit/public/web/WebPluginParams.h" 21 #include "third_party/WebKit/public/web/WebPluginParams.h"
19 #include "third_party/WebKit/public/web/WebView.h" 22 #include "third_party/WebKit/public/web/WebView.h"
20 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestInterfaces.h"
21 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestProxy.h"
22 #include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/Web TestRunner.h"
23 #include "v8/include/v8.h" 23 #include "v8/include/v8.h"
24 #include "webkit/mocks/mock_webhyphenator.h" 24 #include "webkit/mocks/mock_webhyphenator.h"
25 #include "webkit/support/mock_webclipboard_impl.h" 25 #include "webkit/support/mock_webclipboard_impl.h"
26 26
27 using WebKit::WebClipboard; 27 using WebKit::WebClipboard;
28 using WebKit::WebFrame; 28 using WebKit::WebFrame;
29 using WebKit::WebHyphenator; 29 using WebKit::WebHyphenator;
30 using WebKit::WebMediaStreamCenter; 30 using WebKit::WebMediaStreamCenter;
31 using WebKit::WebMediaStreamCenterClient; 31 using WebKit::WebMediaStreamCenterClient;
32 using WebKit::WebPlugin; 32 using WebKit::WebPlugin;
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 if (CommandLine::ForCurrentProcess()->HasSwitch( 181 if (CommandLine::ForCurrentProcess()->HasSwitch(
182 switches::kEnableBrowserPluginForAllViewTypes)) { 182 switches::kEnableBrowserPluginForAllViewTypes)) {
183 // Allow BrowserPlugin if forced by command line flag. This is generally 183 // Allow BrowserPlugin if forced by command line flag. This is generally
184 // true for tests. 184 // true for tests.
185 return true; 185 return true;
186 } 186 }
187 return ContentRendererClient::AllowBrowserPlugin(container); 187 return ContentRendererClient::AllowBrowserPlugin(container);
188 } 188 }
189 189
190 } // namespace content 190 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/common/webkit_test_helpers.cc ('k') | content/shell/renderer/shell_render_process_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698