Enable ThreadRestrictionVerifier for StringImpl

third_party/WebKit/Source/modules/webdatabase/SQLTransactionClient.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 28 matching lines @@
 #include "public/platform/Platform.h"
 #include "public/platform/WebDatabaseObserver.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebTraceLocation.h"
 #include "wtf/Functional.h"
 
 namespace blink {
 
 namespace {
 
-void databaseModified(const WebSecurityOrigin& origin,
-                      const String& databaseName) {
-  if (Platform::current()->databaseObserver())
-    Platform::current()->databaseObserver()->databaseModified(origin,
-                                                              databaseName);
-}
-
-void databaseModifiedCrossThread(const String& originString,
-                                 const String& databaseName) {
-  databaseModified(WebSecurityOrigin::createFromString(originString),
-                   databaseName);
+void databaseModified(SecurityOrigin* origin, const String& databaseName) {
+  if (Platform::current()->databaseObserver()) {
+    Platform::current()->databaseObserver()->databaseModified(
+        WebSecurityOrigin(origin), databaseName);
+  }
 }
 
 }  // namespace
 
 void SQLTransactionClient::didCommitWriteTransaction(Database* database) {
   String databaseName = database->stringIdentifier();
   ExecutionContext* executionContext =
       database->getDatabaseContext()->getExecutionContext();
   if (!executionContext->isContextThread()) {
+    // TODO(csharrison): Is using crossThreadUnretained safe here?
     executionContext->postTask(
         TaskType::DatabaseAccess, BLINK_FROM_HERE,
         createCrossThreadTask(
-            &databaseModifiedCrossThread,
-            executionContext->getSecurityOrigin()->toRawString(),
+            &databaseModified,
+            crossThreadUnretained(executionContext->getSecurityOrigin()),
             databaseName));
   } else {
-    databaseModified(WebSecurityOrigin(executionContext->getSecurityOrigin()),
-                     databaseName);
+    databaseModified(executionContext->getSecurityOrigin(), databaseName);
   }
 }
 
 bool SQLTransactionClient::didExceedQuota(Database* database) {
   // Chromium does not allow users to manually change the quota for an origin
   // (for now, at least).  Don't do anything.
-  ASSERT(
+  DCHECK(
       database->getDatabaseContext()->getExecutionContext()->isContextThread());
   return false;
 }
 
 }  // namespace blink