Use explicit WebString <-> string16 conversion methods in storage API files

content/child/web_database_observer_impl.cc

 // Copyright 2013 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 "content/child/web_database_observer_impl.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
@@ skipping 64 matching lines @@
 
 WebDatabaseObserverImpl::~WebDatabaseObserverImpl() {
 }
 
 void WebDatabaseObserverImpl::databaseOpened(
     const WebSecurityOrigin& origin,
     const WebString& database_name,
     const WebString& database_display_name,
     unsigned long estimated_size) {
   open_connections_->AddOpenConnection(GetIdentifierFromOrigin(origin),
-                                       database_name);
-  sender_->Send(new DatabaseHostMsg_Opened(
-      origin, database_name, database_display_name, estimated_size));
+                                       database_name.utf16());
+  sender_->Send(new DatabaseHostMsg_Opened(origin, database_name.utf16(),
+                                           database_display_name.utf16(),
+                                           estimated_size));
 }
 
 void WebDatabaseObserverImpl::databaseModified(const WebSecurityOrigin& origin,
                                                const WebString& database_name) {
-  sender_->Send(new DatabaseHostMsg_Modified(origin, database_name));
+  sender_->Send(new DatabaseHostMsg_Modified(origin, database_name.utf16()));
 }
 
 void WebDatabaseObserverImpl::databaseClosed(const WebSecurityOrigin& origin,
                                              const WebString& database_name) {
   DCHECK(!main_thread_task_runner_->RunsTasksOnCurrentThread());
+  base::string16 database_name_utf16 = database_name.utf16();
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(base::IgnoreResult(&IPC::SyncMessageFilter::Send), sender_,
-                 new DatabaseHostMsg_Closed(origin, database_name)));
+                 new DatabaseHostMsg_Closed(origin, database_name_utf16)));
   open_connections_->RemoveOpenConnection(GetIdentifierFromOrigin(origin),
-                                          database_name);
+                                          database_name_utf16);
 }
 
 void WebDatabaseObserverImpl::reportOpenDatabaseResult(
     const WebSecurityOrigin& origin,
     const WebString& database_name,
     int callsite,
     int websql_error,
     int sqlite_error,
     double call_time) {
   UMA_HISTOGRAM_WEBSQL_RESULT("OpenResult", callsite,
@@ skipping 69 matching lines @@
   return open_connections_->WaitForAllDatabasesToClose(timeout);
 }
 
 void WebDatabaseObserverImpl::HandleSqliteError(const WebSecurityOrigin& origin,
                                                 const WebString& database_name,
                                                 int error) {
   // We filter out errors which the backend doesn't act on to avoid
   // a unnecessary ipc traffic, this method can get called at a fairly
   // high frequency (per-sqlstatement).
   if (error == SQLITE_CORRUPT || error == SQLITE_NOTADB) {
-    sender_->Send(
-        new DatabaseHostMsg_HandleSqliteError(origin, database_name, error));
+    sender_->Send(new DatabaseHostMsg_HandleSqliteError(
+        origin, database_name.utf16(), error));
   }
 }
 
 }  // namespace content