webkit/tools/test_shell/test_shell_webkit_init.cc - Issue 4705007: Don't restrict supported media types in test_shell when running interactively

Side by Side Diff: webkit/tools/test_shell/test_shell_webkit_init.cc

Issue 4705007: Don't restrict supported media types in test_shell when running interactively (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 1 month 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

« no previous file with comments | « webkit/support/test_webkit_client.cc ('k') | webkit/tools/test_shell/test_shell_webmimeregistry_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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 "webkit/tools/test_shell/test_shell_webkit_init.h"	5 #include "webkit/tools/test_shell/test_shell_webkit_init.h"

6	6

7 #include "base/metrics/stats_counters.h"	7 #include "base/metrics/stats_counters.h"

8 #include "base/path_service.h"	8 #include "base/path_service.h"

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

10 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"	10 #include "third_party/WebKit/WebKit/chromium/public/WebCache.h"

11 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"	11 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"

12 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"	12 #include "third_party/WebKit/WebKit/chromium/public/WebKit.h"

13 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"	13 #include "third_party/WebKit/WebKit/chromium/public/WebRuntimeFeatures.h"

14 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"	14 #include "third_party/WebKit/WebKit/chromium/public/WebScriptController.h"

15 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"	15 #include "third_party/WebKit/WebKit/chromium/public/WebSecurityPolicy.h"

16 #include "webkit/extensions/v8/gears_extension.h"	16 #include "webkit/extensions/v8/gears_extension.h"

17 #include "webkit/tools/test_shell/test_shell.h"	17 #include "webkit/tools/test_shell/test_shell.h"

18	18

19 #if defined(OS_WIN)	19 #if defined(OS_WIN)

20 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"	20 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"

21 #endif	21 #endif

22	22

23 TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode) {	23 TestShellWebKitInit::TestShellWebKitInit(bool layout_test_mode)

	24 : mime_registry_(layout_test_mode) {
	scherkus (not reviewing) 2010/11/11 19:27:00 what about creating a webkit_glue::SimpleWebMimeRe what about creating a webkit_glue::SimpleWebMimeRegistryImpl instead?
24 v8::V8::SetCounterFunction(base::StatsTable::FindLocation);	25 v8::V8::SetCounterFunction(base::StatsTable::FindLocation);

25	26

26 WebKit::initialize(this);	27 WebKit::initialize(this);

27 WebKit::setLayoutTestMode(layout_test_mode);	28 WebKit::setLayoutTestMode(layout_test_mode);

28 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(	29 WebKit::WebSecurityPolicy::registerURLSchemeAsLocal(

29 WebKit::WebString::fromUTF8("test-shell-resource"));	30 WebKit::WebString::fromUTF8("test-shell-resource"));

30 WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(	31 WebKit::WebSecurityPolicy::registerURLSchemeAsNoAccess(

31 WebKit::WebString::fromUTF8("test-shell-resource"));	32 WebKit::WebString::fromUTF8("test-shell-resource"));

32 WebKit::WebScriptController::enableV8SingleThreadMode();	33 WebKit::WebScriptController::enableV8SingleThreadMode();

33 WebKit::WebScriptController::registerExtension(	34 WebKit::WebScriptController::registerExtension(

(...skipping 72 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
106 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00"	107 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00"

107 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a"	108 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a"

108 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a"	109 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a"

109 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d"	110 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d"

110 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60"	111 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60"

111 "\x82";	112 "\x82";

112 return WebKit::WebData(red_square, arraysize(red_square));	113 return WebKit::WebData(red_square, arraysize(red_square));

113 }	114 }

114 return webkit_glue::WebKitClientImpl::loadResource(name);	115 return webkit_glue::WebKitClientImpl::loadResource(name);

115 }	116 }

OLD	NEW