test_shell_webblobregistry_impl.cc posts CString to other threads without

webkit/tools/test_shell/test_shell_webblobregistry_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/tools/test_shell/test_shell_webblobregistry_impl.h"
 
 #include "base/message_loop.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebBlobData.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebCString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
 #include "webkit/blob/blob_data.h"
 #include "webkit/blob/blob_storage_controller.h"
 
 using WebKit::WebBlobData;
 using WebKit::WebString;
 using WebKit::WebURL;
 
 namespace {
 
 MessageLoop* g_io_thread;
 webkit_blob::BlobStorageController* g_blob_storage_controller;
 
 }  // namespace
 
 /* static */
 void TestShellWebBlobRegistryImpl::InitializeOnIOThread(
     webkit_blob::BlobStorageController* blob_storage_controller) {
   g_io_thread = MessageLoop::current();
   g_blob_storage_controller = blob_storage_controller;
 }
 
 /* static */
 void TestShellWebBlobRegistryImpl::Cleanup() {
   g_io_thread = NULL;
   g_blob_storage_controller = NULL;
 }
 
+// Copy WebURL object to safely pass it to a different thread
+static void CopyWebURL(const WebURL& source, WebURL* target) {

[tony, 2011/04/19 22:27:35]

I would probably just return a WebURL.  There's an extra copy, but this code
doesn't seem time critical.  *shrug*

[jianli, 2011/04/19 22:53:02]

I agree with Tony that returning a WebURL will make the calling code look
better. Also, it might be better to call it as GetUrlCopy.

In addition, can we move this helper function to the anonymouse namespace above.

+  // Creates a copy of WebCString with refcount 1

[jianli, 2011/04/19 22:53:02]

Please end with period.

+  const WebKit::WebCString spec(source.spec());
+  const url_parse::Parsed& parsed(source.parsed());
+  const bool is_valid = source.isValid();
+  target->assign(spec, parsed, is_valid);
+}
+
 TestShellWebBlobRegistryImpl::TestShellWebBlobRegistryImpl() {
 }
 
 void TestShellWebBlobRegistryImpl::registerBlobURL(
     const WebURL& url, WebBlobData& data) {
   DCHECK(g_io_thread);
   // Note: BlobData is not refcounted thread safe.
   scoped_refptr<webkit_blob::BlobData> blob_data(
       new webkit_blob::BlobData(data));
+  WebURL url_copy;
+  CopyWebURL(url, &url_copy);
   g_io_thread->PostTask(
       FROM_HERE,
       NewRunnableMethod(
-          this, &TestShellWebBlobRegistryImpl::DoRegisterBlobUrl, url,
+          this, &TestShellWebBlobRegistryImpl::DoRegisterBlobUrl, url_copy,
           blob_data));
 }
 
 void TestShellWebBlobRegistryImpl::registerBlobURL(
     const WebURL& url, const WebURL& src_url) {
   DCHECK(g_io_thread);
+  WebURL url_copy;
+  CopyWebURL(url, &url_copy);
+  WebURL src_url_copy;
+  CopyWebURL(src_url, &src_url_copy);
   g_io_thread->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &TestShellWebBlobRegistryImpl::DoRegisterBlobUrlFrom,
-                        url,
-                        src_url));
+                        url_copy,
+                        src_url_copy));
 }
 
 void TestShellWebBlobRegistryImpl::unregisterBlobURL(const WebURL& url) {
   DCHECK(g_io_thread);
+  WebURL url_copy;
+  CopyWebURL(url, &url_copy);
   g_io_thread->PostTask(
       FROM_HERE,
       NewRunnableMethod(this,
                         &TestShellWebBlobRegistryImpl::DoUnregisterBlobUrl,
                         url));

[tony, 2011/04/19 22:27:35]

Did you mean to use url_copy here?

 }
 
 void TestShellWebBlobRegistryImpl::DoRegisterBlobUrl(
     const GURL& url, webkit_blob::BlobData* blob_data) {
   DCHECK(g_blob_storage_controller);
   g_blob_storage_controller->RegisterBlobUrl(url, blob_data);
 }
 
 void TestShellWebBlobRegistryImpl::DoRegisterBlobUrlFrom(
     const GURL& url, const GURL& src_url) {
   DCHECK(g_blob_storage_controller);
   g_blob_storage_controller->RegisterBlobUrlFrom(url, src_url);
 }
 
 void TestShellWebBlobRegistryImpl::DoUnregisterBlobUrl(const GURL& url) {
   DCHECK(g_blob_storage_controller);
   g_blob_storage_controller->UnregisterBlobUrl(url);
 }