IndexedDB: Switch key/value handling from vector<char> to std::string

content/child/indexed_db/indexed_db_dispatcher.cc

Index: content/child/indexed_db/indexed_db_dispatcher.cc
diff --git a/content/child/indexed_db/indexed_db_dispatcher.cc b/content/child/indexed_db/indexed_db_dispatcher.cc
index 48391f4714bf3adfcf1ea381e90c4b813e7455c6..e35d733a4ec9a672a00396475c6fa3e98ec11c3c 100644
--- a/content/child/indexed_db/indexed_db_dispatcher.cc
+++ b/content/child/indexed_db/indexed_db_dispatcher.cc
@@ -491,14 +491,14 @@ void IndexedDBDispatcher::OnSuccessStringList(
 
 void IndexedDBDispatcher::OnSuccessValue(int32 ipc_thread_id,
                                          int32 ipc_callbacks_id,
-                                         const std::vector<char>& value) {
+                                         const std::string& value) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
   WebIDBCallbacks* callbacks = pending_callbacks_.Lookup(ipc_callbacks_id);
   if (!callbacks)
     return;
   WebData web_value;
   if (value.size())

[alecflett, 2013/07/09 18:26:30]

I think you can skip the if (value.size()) now? Or does that
deref-empty-iterators issue affect strings too?

[jsbell, 2013/07/09 19:41:46]

Affects strings too.

-    web_value.assign(&value.front(), value.size());
+    web_value.assign(&*value.begin(), value.size());
   callbacks->onSuccess(web_value);
   pending_callbacks_.Remove(ipc_callbacks_id);
 }
@@ -506,7 +506,7 @@ void IndexedDBDispatcher::OnSuccessValue(int32 ipc_thread_id,
 void IndexedDBDispatcher::OnSuccessValueWithKey(
     int32 ipc_thread_id,
     int32 ipc_callbacks_id,
-    const std::vector<char>& value,
+    const std::string& value,
     const IndexedDBKey& primary_key,
     const IndexedDBKeyPath& key_path) {
   DCHECK_EQ(ipc_thread_id, CurrentWorkerId());
@@ -571,7 +571,7 @@ void IndexedDBDispatcher::OnSuccessCursorContinue(
   int32 ipc_cursor_id = p.ipc_cursor_id;
   const IndexedDBKey& key = p.key;
   const IndexedDBKey& primary_key = p.primary_key;
-  const std::vector<char>& value = p.value;
+  const std::string& value = p.value;
 
   RendererWebIDBCursorImpl* cursor = cursors_[ipc_cursor_id];
   DCHECK(cursor);
@@ -582,7 +582,7 @@ void IndexedDBDispatcher::OnSuccessCursorContinue(
 
   WebData web_value;
   if (value.size())
-    web_value.assign(&value.front(), value.size());
+    web_value.assign(&*value.begin(), value.size());
   callbacks->onSuccess(key, primary_key, web_value);
 
   pending_callbacks_.Remove(ipc_callbacks_id);