Commit a5827f8e authored by vivek.vg's avatar vivek.vg Committed by Commit bot

Utilize TestContentClient in RenderViewTest as resources are being migrated to using grd system.

Blink is about to use blink_resources.grd for the inline resources of user agent stylesheets.
This removes the dependency upon using make-file-arrays.py which embeds these resources as strings.

This patch instantiates TestContentClient which does all the plumbing required for various test targets in content.
As the resources are being moved into blink_resources.grd, this generates blink_resources.pak.
This pak doesn't exists as a separate pak file but its repacked into "content_shell.pak".

This blink side changes were reverted here https://codereview.chromium.org/567073004/

The reason for reverting: Breaking quite a few browser_tests and content_browsertests across multiple platforms.

BUG=312586

Review URL: https://codereview.chromium.org/567153002

Cr-Commit-Position: refs/heads/master@{#295071}
parent 087ba0b2
......@@ -92,6 +92,7 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/clearkeycdmadapter.plugin',
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/libclearkeycdm.dylib',
'<(PRODUCT_DIR)/osmesa.so',
'<(PRODUCT_DIR)/ppapi_nacl_tests_glibc_x32.nexe',
......@@ -141,6 +142,7 @@
['chromeos==1', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/content_shell.pak',
'<(PRODUCT_DIR)/keyboard_resources.pak',
'<(PRODUCT_DIR)/libexif.so',
'<(PRODUCT_DIR)/nacl_helper',
......
......@@ -10,6 +10,20 @@
],
},
}],
['chromeos==1', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
['OS=="mac"', {
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/content_shell.pak',
],
},
}],
['OS=="android" or OS=="linux" or OS=="mac" or OS=="win"', {
'variables': {
'isolate_dependency_untracked': [
......
......@@ -22,6 +22,7 @@
#include "content/renderer/renderer_main_platform_delegate.h"
#include "content/renderer/renderer_webkitplatformsupport_impl.h"
#include "content/test/mock_render_process.h"
#include "content/test/test_content_client.h"
#include "third_party/WebKit/public/platform/WebScreenInfo.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebHistoryItem.h"
......@@ -391,7 +392,7 @@ blink::WebWidget* RenderViewTest::GetWebWidget() {
ContentClient* RenderViewTest::CreateContentClient() {
return new ContentClient;
return new TestContentClient;
}
ContentBrowserClient* RenderViewTest::CreateContentBrowserClient() {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment