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

LevelDB uses std::string in its APIs. To eliminate a conversion and
simplify the code, switch the IDB backend from vector<char> to string
as well.

Also eliminate the LevelDBSlice type as well, using StringPiece
and leveldb::Slice as appropriate.

R=alecflett@chromium.org,tsepez@chromium.org
TBR=jam@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18075008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210698 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 8 deletions

diff --git a/content/browser/indexed_db/indexed_db_callbacks.cc b/content/browser/indexed_db/indexed_db_callbacks.cc
index 1525eeb..1db9747 100644
--- a/content/browser/indexed_db/indexed_db_callbacks.cc
+++ b/content/browser/indexed_db/indexed_db_callbacks.cc
@@ -5,7 +5,6 @@
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 
 #include <algorithm>
-#include <vector>
 
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
@@ -160,7 +159,7 @@ void IndexedDBCallbacks::OnSuccess(scoped_ptr<IndexedDBConnection> connection,
 void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
                                    const IndexedDBKey& key,
                                    const IndexedDBKey& primary_key,
-                                   std::vector<char>* value) {
+                                   std::string* value) {
   DCHECK(dispatcher_host_.get());
 
   DCHECK_EQ(kNoCursor, ipc_cursor_id_);
@@ -186,7 +185,7 @@ void IndexedDBCallbacks::OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
 
 void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& key,
                                    const IndexedDBKey& primary_key,
-                                   std::vector<char>* value) {
+                                   std::string* value) {
   DCHECK(dispatcher_host_.get());
 
   DCHECK_NE(kNoCursor, ipc_cursor_id_);
@@ -218,7 +217,7 @@ void IndexedDBCallbacks::OnSuccess(const IndexedDBKey& key,
 void IndexedDBCallbacks::OnSuccessWithPrefetch(
     const std::vector<IndexedDBKey>& keys,
     const std::vector<IndexedDBKey>& primary_keys,
-    const std::vector<std::vector<char> >& values) {
+    const std::vector<std::string>& values) {
   DCHECK_EQ(keys.size(), primary_keys.size());
   DCHECK_EQ(keys.size(), values.size());
 
@@ -249,7 +248,7 @@ void IndexedDBCallbacks::OnSuccessWithPrefetch(
   dispatcher_host_ = NULL;
 }
 
-void IndexedDBCallbacks::OnSuccess(std::vector<char>* value,
+void IndexedDBCallbacks::OnSuccess(std::string* value,
                                    const IndexedDBKey& key,
                                    const IndexedDBKeyPath& key_path) {
   DCHECK(dispatcher_host_.get());
@@ -259,9 +258,10 @@ void IndexedDBCallbacks::OnSuccess(std::vector<char>* value,
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
-  std::vector<char> value_copy;
+  std::string value_copy;
   if (value && !value->empty())
     std::swap(value_copy, *value);
+
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessValueWithKey(
       ipc_thread_id_,
       ipc_callbacks_id_,
@@ -272,7 +272,7 @@ void IndexedDBCallbacks::OnSuccess(std::vector<char>* value,
   dispatcher_host_ = NULL;
 }
 
-void IndexedDBCallbacks::OnSuccess(std::vector<char>* value) {
+void IndexedDBCallbacks::OnSuccess(std::string* value) {
   DCHECK(dispatcher_host_.get());
 
   DCHECK(kNoCursor == ipc_cursor_id_ || value == NULL);
@@ -280,9 +280,10 @@ void IndexedDBCallbacks::OnSuccess(std::vector<char>* value) {
   DCHECK_EQ(kNoDatabase, ipc_database_id_);
   DCHECK_EQ(kNoDatabaseCallbacks, ipc_database_callbacks_id_);
 
-  std::vector<char> value_copy;
+  std::string value_copy;
   if (value && !value->empty())
     std::swap(value_copy, *value);
+
   dispatcher_host_->Send(new IndexedDBMsg_CallbacksSuccessValue(
       ipc_thread_id_,
       ipc_callbacks_id_,