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

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

Issue 243108: Enable WebSocket in test_shell (Closed)
Patch Set: add +net/socket_stream in webkit/DEPS Created 11 years, 2 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 | « webkit/tools/test_shell/test_shell.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
2 // source code is governed by a BSD-style license that can be found in the 2 // source code is governed by a BSD-style license that can be found in the
3 // LICENSE file. 3 // LICENSE file.
4 4
5 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 5 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 6 #define WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
7 7
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/scoped_temp_dir.h" 10 #include "base/scoped_temp_dir.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 45
46 WebKit::initialize(this); 46 WebKit::initialize(this);
47 WebKit::setLayoutTestMode(layout_test_mode); 47 WebKit::setLayoutTestMode(layout_test_mode);
48 WebKit::registerURLSchemeAsLocal( 48 WebKit::registerURLSchemeAsLocal(
49 ASCIIToUTF16(webkit_glue::GetUIResourceProtocol())); 49 ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
50 WebKit::registerURLSchemeAsNoAccess( 50 WebKit::registerURLSchemeAsNoAccess(
51 ASCIIToUTF16(webkit_glue::GetUIResourceProtocol())); 51 ASCIIToUTF16(webkit_glue::GetUIResourceProtocol()));
52 WebKit::enableV8SingleThreadMode(); 52 WebKit::enableV8SingleThreadMode();
53 WebKit::registerExtension(extensions_v8::GearsExtension::Get()); 53 WebKit::registerExtension(extensions_v8::GearsExtension::Get());
54 WebKit::registerExtension(extensions_v8::IntervalExtension::Get()); 54 WebKit::registerExtension(extensions_v8::IntervalExtension::Get());
55 WebKit::enableWebSockets();
55 56
56 // Load libraries for media and enable the media player. 57 // Load libraries for media and enable the media player.
57 FilePath module_path; 58 FilePath module_path;
58 if (PathService::Get(base::DIR_MODULE, &module_path) && 59 if (PathService::Get(base::DIR_MODULE, &module_path) &&
59 media::InitializeMediaLibrary(module_path)) { 60 media::InitializeMediaLibrary(module_path)) {
60 WebKit::enableMediaPlayer(); 61 WebKit::enableMediaPlayer();
61 } 62 }
62 63
63 // Construct and initialize an appcache system for this scope. 64 // Construct and initialize an appcache system for this scope.
64 // A new empty temp directory is created to house any cached 65 // A new empty temp directory is created to house any cached
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 SimpleAppCacheSystem appcache_system_; 231 SimpleAppCacheSystem appcache_system_;
231 SimpleDatabaseSystem database_system_; 232 SimpleDatabaseSystem database_system_;
232 scoped_ptr<WebKit::WebStorageEventDispatcher> dom_storage_event_dispatcher_; 233 scoped_ptr<WebKit::WebStorageEventDispatcher> dom_storage_event_dispatcher_;
233 234
234 #if defined(OS_WIN) 235 #if defined(OS_WIN)
235 WebKit::WebThemeEngine* active_theme_engine_; 236 WebKit::WebThemeEngine* active_theme_engine_;
236 #endif 237 #endif
237 }; 238 };
238 239
239 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 240 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
OLDNEW
« no previous file with comments | « webkit/tools/test_shell/test_shell.gyp ('k') | webkit/webkit.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698