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

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

Issue 652052: Workaround for http://crbug.com/36451 which is blocking https://bugs.webkit.o... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 10 years, 10 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
« no previous file with comments | « no previous file | no next file » | 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 extensions_v8::IntervalExtension::Get()); 59 extensions_v8::IntervalExtension::Get());
60 WebKit::WebRuntimeFeatures::enableSockets(true); 60 WebKit::WebRuntimeFeatures::enableSockets(true);
61 WebKit::WebRuntimeFeatures::enableApplicationCache(true); 61 WebKit::WebRuntimeFeatures::enableApplicationCache(true);
62 WebKit::WebRuntimeFeatures::enableDatabase(true); 62 WebKit::WebRuntimeFeatures::enableDatabase(true);
63 63
64 // Load libraries for media and enable the media player. 64 // Load libraries for media and enable the media player.
65 FilePath module_path; 65 FilePath module_path;
66 WebKit::WebRuntimeFeatures::enableMediaPlayer( 66 WebKit::WebRuntimeFeatures::enableMediaPlayer(
67 PathService::Get(base::DIR_MODULE, &module_path) && 67 PathService::Get(base::DIR_MODULE, &module_path) &&
68 media::InitializeMediaLibrary(module_path)); 68 media::InitializeMediaLibrary(module_path));
69 // TODO(joth): Make a dummy geolocation service implemenation for
70 // test_shell, and set this to true. http://crbug.com/36451
71 WebKit::WebRuntimeFeatures::enableGeolocation(false);
69 72
70 // Construct and initialize an appcache system for this scope. 73 // Construct and initialize an appcache system for this scope.
71 // A new empty temp directory is created to house any cached 74 // A new empty temp directory is created to house any cached
72 // content during the run. Upon exit that directory is deleted. 75 // content during the run. Upon exit that directory is deleted.
73 // If we can't create a tempdir, we'll use in-memory storage. 76 // If we can't create a tempdir, we'll use in-memory storage.
74 if (!appcache_dir_.CreateUniqueTempDir()) { 77 if (!appcache_dir_.CreateUniqueTempDir()) {
75 LOG(WARNING) << "Failed to create a temp dir for the appcache, " 78 LOG(WARNING) << "Failed to create a temp dir for the appcache, "
76 "using in-memory storage."; 79 "using in-memory storage.";
77 DCHECK(appcache_dir_.path().empty()); 80 DCHECK(appcache_dir_.path().empty());
78 } 81 }
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 ScopedTempDir appcache_dir_; 238 ScopedTempDir appcache_dir_;
236 SimpleAppCacheSystem appcache_system_; 239 SimpleAppCacheSystem appcache_system_;
237 SimpleDatabaseSystem database_system_; 240 SimpleDatabaseSystem database_system_;
238 241
239 #if defined(OS_WIN) 242 #if defined(OS_WIN)
240 WebKit::WebThemeEngine* active_theme_engine_; 243 WebKit::WebThemeEngine* active_theme_engine_;
241 #endif 244 #endif
242 }; 245 };
243 246
244 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 247 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698