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

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

Issue 3282003: Support handling blob URL and resolve blob references in upload data.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 3 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
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 #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/path_service.h" 7 #include "base/path_service.h"
8 #include "base/stats_counters.h" 8 #include "base/stats_counters.h"
9 #include "media/base/media.h" 9 #include "media/base/media.h"
10 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h" 10 #include "third_party/WebKit/WebKit/chromium/public/WebDatabase.h"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 // If we can't create a tempdir, we'll use in-memory storage. 59 // If we can't create a tempdir, we'll use in-memory storage.
60 if (!appcache_dir_.CreateUniqueTempDir()) { 60 if (!appcache_dir_.CreateUniqueTempDir()) {
61 LOG(WARNING) << "Failed to create a temp dir for the appcache, " 61 LOG(WARNING) << "Failed to create a temp dir for the appcache, "
62 "using in-memory storage."; 62 "using in-memory storage.";
63 DCHECK(appcache_dir_.path().empty()); 63 DCHECK(appcache_dir_.path().empty());
64 } 64 }
65 SimpleAppCacheSystem::InitializeOnUIThread(appcache_dir_.path()); 65 SimpleAppCacheSystem::InitializeOnUIThread(appcache_dir_.path());
66 66
67 WebKit::WebDatabase::setObserver(&database_system_); 67 WebKit::WebDatabase::setObserver(&database_system_);
68 68
69 web_blob_registry_ = new TestShellWebBlobRegistryImpl();
70
69 file_utilities_.set_sandbox_enabled(false); 71 file_utilities_.set_sandbox_enabled(false);
70 72
71 #if defined(OS_WIN) 73 #if defined(OS_WIN)
72 // Ensure we pick up the default theme engine. 74 // Ensure we pick up the default theme engine.
73 SetThemeEngine(NULL); 75 SetThemeEngine(NULL);
74 #endif 76 #endif
75 } 77 }
76 78
77 TestShellWebKitInit::~TestShellWebKitInit() { 79 TestShellWebKitInit::~TestShellWebKitInit() {
78 WebKit::shutdown(); 80 WebKit::shutdown();
(...skipping 21 matching lines...) Expand all
100 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00" 102 "\xff\x00\xff\x00\xff\xff\xff\xff\xff\x7b\x1f\xb1\xc4\x00\x00\x00"
101 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a" 103 "\x09\x70\x48\x59\x73\x00\x00\x0b\x13\x00\x00\x0b\x13\x01\x00\x9a"
102 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a" 104 "\x9c\x18\x00\x00\x00\x17\x49\x44\x41\x54\x78\x01\x63\x98\x89\x0a"
103 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d" 105 "\x18\x50\xb9\x33\x47\xf9\xa8\x01\x32\xd4\xc2\x03\x00\x33\x84\x0d"
104 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60" 106 "\x02\x3a\x91\xeb\xa5\x00\x00\x00\x00\x49\x45\x4e\x44\xae\x42\x60"
105 "\x82"; 107 "\x82";
106 return WebKit::WebData(red_square, arraysize(red_square)); 108 return WebKit::WebData(red_square, arraysize(red_square));
107 } 109 }
108 return webkit_glue::WebKitClientImpl::loadResource(name); 110 return webkit_glue::WebKitClientImpl::loadResource(name);
109 } 111 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698