Index: webkit/tools/test_shell/test_shell_webblobregistry_impl.h |
=================================================================== |
--- webkit/tools/test_shell/test_shell_webblobregistry_impl.h (revision 186525) |
+++ webkit/tools/test_shell/test_shell_webblobregistry_impl.h (working copy) |
@@ -12,7 +12,7 @@ |
namespace webkit_blob { |
class BlobData; |
-class BlobStorageController; |
+class BlobStorageContext; |
} |
class TestShellWebBlobRegistryImpl |
@@ -20,17 +20,19 @@ |
public base::RefCountedThreadSafe<TestShellWebBlobRegistryImpl> { |
public: |
static void InitializeOnIOThread( |
- webkit_blob::BlobStorageController* blob_storage_controller); |
+ webkit_blob::BlobStorageContext* blob_storage_context); |
static void Cleanup(); |
TestShellWebBlobRegistryImpl(); |
- // See WebBlobRegistry.h for documentation on these functions. |
- virtual void registerBlobURL(const WebKit::WebURL& url, |
- WebKit::WebBlobData& data); |
- virtual void registerBlobURL(const WebKit::WebURL& url, |
- const WebKit::WebURL& src_url); |
- virtual void unregisterBlobURL(const WebKit::WebURL& url); |
+ // WebBlobRegistry interface implementation. |
+ virtual void registerBlobData(const WebKit::WebString& uuid, |
+ const WebKit::WebBlobData&); |
+ virtual void addBlobDataRef(const WebKit::WebString& uuid); |
+ virtual void removeBlobDataRef(const WebKit::WebString& uuid); |
+ virtual void registerPublicBlobURL(const WebKit::WebURL&, |
+ const WebKit::WebString& uuid); |
+ virtual void revokePublicBlobURL(const WebKit::WebURL&); |
protected: |
virtual ~TestShellWebBlobRegistryImpl() {} |
@@ -38,10 +40,12 @@ |
private: |
friend class base::RefCountedThreadSafe<TestShellWebBlobRegistryImpl>; |
- // Run on I/O thread. |
- void AddFinishedBlob(const GURL& url, webkit_blob::BlobData* blob_data); |
- void CloneBlob(const GURL& url, const GURL& src_url); |
- void RemoveBlob(const GURL& url); |
+ // All processing for WebBlobRegistry calls are serialized on the I/O thread. |
+ void AddFinishedBlob(webkit_blob::BlobData* blob_data); |
+ void AddBlobDataRef(const std::string& uuid); |
+ void RemoveBlobDataRef(const std::string& uuid); |
+ void RegisterPublicBlobURL(const GURL& url, const std::string& uuid); |
+ void RevokePublicBlobURL(const GURL& url); |
DISALLOW_COPY_AND_ASSIGN(TestShellWebBlobRegistryImpl); |
}; |