summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 22:51:05 +0000
committerjochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 22:51:05 +0000
commit98e97d0f4d97fcc22b403feedcab2c66d2bfc920 (patch)
treea3883d412b85915df654f9fa65b25f55e1edb142 /content
parent53ce2ca7a21ad02970fafa864582927abd407859 (diff)
downloadchromium_src-98e97d0f4d97fcc22b403feedcab2c66d2bfc920.zip
chromium_src-98e97d0f4d97fcc22b403feedcab2c66d2bfc920.tar.gz
chromium_src-98e97d0f4d97fcc22b403feedcab2c66d2bfc920.tar.bz2
[content shell] use the permission client provided by the TestRunner for layout tests
BUG=111316 R=thakis@chromium.org TEST=platform/chromium/permissionClient tests pass Review URL: https://codereview.chromium.org/12450006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186276 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/shell/shell_content_renderer_client.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/shell/shell_content_renderer_client.cc b/content/shell/shell_content_renderer_client.cc
index ab45e48..c407e842 100644
--- a/content/shell/shell_content_renderer_client.cc
+++ b/content/shell/shell_content_renderer_client.cc
@@ -19,6 +19,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestInterfaces.h"
#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestProxy.h"
+#include "third_party/WebKit/Tools/DumpRenderTree/chromium/TestRunner/public/WebTestRunner.h"
#include "v8/include/v8.h"
#include "webkit/mocks/mock_webhyphenator.h"
#include "webkit/tools/test_shell/mock_webclipboard_impl.h"
@@ -75,6 +76,9 @@ void ShellContentRendererClient::RenderViewCreated(RenderView* render_view) {
test_runner->Reset();
render_view->GetWebView()->setSpellCheckClient(
test_runner->proxy()->spellCheckClient());
+ render_view->GetWebView()->setPermissionClient(
+ ShellRenderProcessObserver::GetInstance()->test_interfaces()->testRunner()
+ ->webPermissions());
WebTestDelegate* delegate =
ShellRenderProcessObserver::GetInstance()->test_delegate();
if (delegate == static_cast<WebTestDelegate*>(test_runner))