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

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

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 | « no previous file | webkit/tools/test_shell/test_shell_webkit_init.cc » ('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) 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 #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/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h" 9 #include "third_party/WebKit/WebKit/chromium/public/WebGraphicsContext3D.h"
10 #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebIDBFactory.h"
(...skipping 17 matching lines...) Expand all
28 #if defined(OS_WIN) 28 #if defined(OS_WIN)
29 #include "webkit/tools/test_shell/test_shell_webthemeengine.h" 29 #include "webkit/tools/test_shell/test_shell_webthemeengine.h"
30 #endif 30 #endif
31 31
32 class TestShellWebKitInit : public webkit_glue::WebKitClientImpl { 32 class TestShellWebKitInit : public webkit_glue::WebKitClientImpl {
33 public: 33 public:
34 explicit TestShellWebKitInit(bool layout_test_mode); 34 explicit TestShellWebKitInit(bool layout_test_mode);
35 ~TestShellWebKitInit(); 35 ~TestShellWebKitInit();
36 36
37 virtual WebKit::WebMimeRegistry* mimeRegistry() { 37 virtual WebKit::WebMimeRegistry* mimeRegistry() {
38 return &mime_registry_; 38 return mime_registry_.get();
39 } 39 }
40 40
41 WebKit::WebClipboard* clipboard(); 41 WebKit::WebClipboard* clipboard();
42 42
43 virtual WebKit::WebFileUtilities* fileUtilities() { 43 virtual WebKit::WebFileUtilities* fileUtilities() {
44 return &file_utilities_; 44 return &file_utilities_;
45 } 45 }
46 46
47 virtual WebKit::WebSandboxSupport* sandboxSupport() { 47 virtual WebKit::WebSandboxSupport* sandboxSupport() {
48 return NULL; 48 return NULL;
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 151
152 virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository() { 152 virtual WebKit::WebSharedWorkerRepository* sharedWorkerRepository() {
153 return NULL; 153 return NULL;
154 } 154 }
155 155
156 virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() { 156 virtual WebKit::WebGraphicsContext3D* createGraphicsContext3D() {
157 return WebKit::WebGraphicsContext3D::createDefault(); 157 return WebKit::WebGraphicsContext3D::createDefault();
158 } 158 }
159 159
160 private: 160 private:
161 TestShellWebMimeRegistryImpl mime_registry_; 161 scoped_ptr<webkit_glue::SimpleWebMimeRegistryImpl> mime_registry_;
162 MockWebClipboardImpl mock_clipboard_; 162 MockWebClipboardImpl mock_clipboard_;
163 webkit_glue::WebClipboardImpl real_clipboard_; 163 webkit_glue::WebClipboardImpl real_clipboard_;
164 webkit_glue::WebFileUtilitiesImpl file_utilities_; 164 webkit_glue::WebFileUtilitiesImpl file_utilities_;
165 ScopedTempDir appcache_dir_; 165 ScopedTempDir appcache_dir_;
166 SimpleAppCacheSystem appcache_system_; 166 SimpleAppCacheSystem appcache_system_;
167 SimpleDatabaseSystem database_system_; 167 SimpleDatabaseSystem database_system_;
168 SimpleWebCookieJarImpl cookie_jar_; 168 SimpleWebCookieJarImpl cookie_jar_;
169 scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_; 169 scoped_refptr<TestShellWebBlobRegistryImpl> blob_registry_;
170 SimpleFileSystem file_system_; 170 SimpleFileSystem file_system_;
171 171
172 #if defined(OS_WIN) 172 #if defined(OS_WIN)
173 WebKit::WebThemeEngine* active_theme_engine_; 173 WebKit::WebThemeEngine* active_theme_engine_;
174 #endif 174 #endif
175 }; 175 };
176 176
177 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_ 177 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_WEBKIT_INIT_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/test_shell/test_shell_webkit_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698