Use builders to convert between WebKit and content IDB types

content/child/indexed_db/proxy_webidbcursor_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/indexed_db/proxy_webidbcursor_impl.h"
 
 #include <vector>
 
 #include "content/child/thread_safe_sender.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
+#include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 
 using WebKit::WebData;
 using WebKit::WebIDBCallbacks;
 using WebKit::WebIDBKey;
 
 namespace content {
 
 RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(
     int32 ipc_cursor_id,
@@ skipping 60 matching lines @@
         prefetch_amount_ = kMaxPrefetchAmount;
 
       return;
     }
   } else {
     // Key argument supplied. We couldn't prefetch this.
     ResetPrefetchCache();
   }
 
   dispatcher->RequestIDBCursorContinue(
-      IndexedDBKey(key), callbacks.release(), ipc_cursor_id_);
+      IndexedDBKeyBuilder::Build(key), callbacks.release(), ipc_cursor_id_);
 }
 
 void RendererWebIDBCursorImpl::postSuccessHandlerCallback() {
   pending_onsuccess_callbacks_--;
 
   // If the onsuccess callback called continue() on the cursor again,
   // and that continue was served by the prefetch cache, then
   // pending_onsuccess_callbacks_ would be incremented.
   // If not, it means the callback did something else, or nothing at all,
   // in which case we need to reset the cache.
@@ skipping 24 matching lines @@
   // this could be a real problem.. we need 2 CachedContinues
   WebData value = prefetch_values_.front();
 
   prefetch_keys_.pop_front();
   prefetch_primary_keys_.pop_front();
   prefetch_values_.pop_front();
   used_prefetches_++;
 
   pending_onsuccess_callbacks_++;
 
-  callbacks->onSuccess(key, primary_key, value);
+  callbacks->onSuccess(WebIDBKeyBuilder::Build(key),
+                       WebIDBKeyBuilder::Build(primary_key), value);
 }
 
 void RendererWebIDBCursorImpl::ResetPrefetchCache() {
   continue_count_ = 0;
   prefetch_amount_ = kMinPrefetchAmount;
 
   if (!prefetch_keys_.size()) {
     // No prefetch cache, so no need to reset the cursor in the back-end.
     return;
   }
 
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
   dispatcher->RequestIDBCursorPrefetchReset(
       used_prefetches_, prefetch_keys_.size(), ipc_cursor_id_);
   prefetch_keys_.clear();
   prefetch_primary_keys_.clear();
   prefetch_values_.clear();
 
   pending_onsuccess_callbacks_ = 0;
 }
 
 }  // namespace content