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

content/browser/indexed_db/indexed_db_cursor.cc

 // Copyright (c) 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/browser/indexed_db/indexed_db_cursor.h"
 
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
@@ skipping 80 matching lines @@
 
   transaction_->ScheduleTask(
       new CursorAdvanceOperation(this, count, callbacks));
 }
 
 void IndexedDBCursor::CursorAdvanceOperation::Perform(
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("CursorAdvanceOperation");
   if (!cursor_->cursor_ || !cursor_->cursor_->Advance(count_)) {
     cursor_->cursor_.reset();
-    callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL));
+    callbacks_->OnSuccess(static_cast<std::string*>(NULL));
     return;
   }
 
   callbacks_->OnSuccess(
       cursor_->key(), cursor_->primary_key(), cursor_->Value());
 }
 
 void IndexedDBCursor::CursorIterationOperation::Perform(
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("CursorIterationOperation");
   if (!cursor_->cursor_ ||
       !cursor_->cursor_->ContinueFunction(
           key_.get(), IndexedDBBackingStore::Cursor::SEEK)) {
     cursor_->cursor_.reset();
-    callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL));
+    callbacks_->OnSuccess(static_cast<std::string*>(NULL));
     return;
   }
 
   callbacks_->OnSuccess(
       cursor_->key(), cursor_->primary_key(), cursor_->Value());
 }
 
 void IndexedDBCursor::PrefetchContinue(
     int number_to_fetch,
     scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::PrefetchContinue");
 
   transaction_->ScheduleTask(
       task_type_,
       new CursorPrefetchIterationOperation(this, number_to_fetch, callbacks));
 }
 
 void IndexedDBCursor::CursorPrefetchIterationOperation::Perform(
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("CursorPrefetchIterationOperation");
 
   std::vector<IndexedDBKey> found_keys;
   std::vector<IndexedDBKey> found_primary_keys;
-  std::vector<std::vector<char> > found_values;
+  std::vector<std::string> found_values;
 
   if (cursor_->cursor_)
     cursor_->saved_cursor_.reset(cursor_->cursor_->Clone());
   const size_t max_size_estimate = 10 * 1024 * 1024;
   size_t size_estimate = 0;
 
   for (int i = 0; i < number_to_fetch_; ++i) {
     if (!cursor_->cursor_ || !cursor_->cursor_->ContinueFunction()) {
       cursor_->cursor_.reset();
       break;
     }
 
     found_keys.push_back(cursor_->cursor_->key());
     found_primary_keys.push_back(cursor_->cursor_->primary_key());
 
     switch (cursor_->cursor_type_) {
       case indexed_db::CURSOR_KEY_ONLY:
-        found_values.push_back(std::vector<char>());
+        found_values.push_back(std::string());
         break;
       case indexed_db::CURSOR_KEY_AND_VALUE: {
-        std::vector<char> value;
+        std::string value;
         value.swap(*cursor_->cursor_->Value());
         size_estimate += value.size();
         found_values.push_back(value);
         break;
       }
       default:
         NOTREACHED();
     }
     size_estimate += cursor_->cursor_->key().size_estimate();
     size_estimate += cursor_->cursor_->primary_key().size_estimate();
 
     if (size_estimate > max_size_estimate)
       break;
   }
 
   if (!found_keys.size()) {
-    callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL));
+    callbacks_->OnSuccess(static_cast<std::string*>(NULL));
     return;
   }
 
   callbacks_->OnSuccessWithPrefetch(
       found_keys, found_primary_keys, found_values);
 }
 
 void IndexedDBCursor::PrefetchReset(int used_prefetches, int) {
   IDB_TRACE("IndexedDBCursor::PrefetchReset");
   cursor_.swap(saved_cursor_);
@@ skipping 10 matching lines @@
 }
 
 void IndexedDBCursor::Close() {
   IDB_TRACE("IndexedDBCursor::Close");
   closed_ = true;
   cursor_.reset();
   saved_cursor_.reset();
 }
 
 }  // namespace content