IndexedDB: API rename to allow return type of keyPath accessors to change

webkit/glue/idb_bindings.cc

 // Copyright (c) 2012 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 "webkit/glue/idb_bindings.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "base/utf_string_conversions.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKeyPath.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 
 namespace webkit_glue {
 
 using WebKit::WebIDBKey;
 using WebKit::WebIDBKeyPath;
 using WebKit::WebSerializedScriptValue;
+using WebKit::WebString;
 
 bool IDBKeysFromValuesAndKeyPath(
     const std::vector<WebSerializedScriptValue>& serialized_script_values,
     const string16& idb_key_path,
     std::vector<WebIDBKey>* values) {
-  WebIDBKeyPath web_idb_key_path = WebIDBKeyPath::create(idb_key_path);
+  // TODO(jsbell): Remove the explicit coercion to WebString.
+  // http://crbug.com/112308
+  WebIDBKeyPath web_idb_key_path =
+      WebIDBKeyPath::create(WebString(idb_key_path));
   bool error = web_idb_key_path.parseError() != 0;
   // When a parse error is encountered, no value is returned (null)
   for (std::vector<WebSerializedScriptValue>::const_iterator i =
            serialized_script_values.begin();
        i != serialized_script_values.end(); ++i) {
     if (error) {
       values->push_back(WebIDBKey::createNull());
     } else {
       values->push_back(
           WebIDBKey::createFromValueAndKeyPath(*i, web_idb_key_path));
     }
   }
   return error;
 }
 
 WebSerializedScriptValue InjectIDBKey(
     const WebIDBKey& key,
     const WebSerializedScriptValue& value,
     const string16& idb_key_path) {
+  // TODO(jsbell): Remove the explicit coercion to WebString.
+  // http://crbug.com/112308
   return WebIDBKey::injectIDBKeyIntoSerializedValue(
-      key, value, WebIDBKeyPath::create(idb_key_path));
+      key, value, WebIDBKeyPath::create(WebString(idb_key_path)));
 }
 
 }  // namespace webkit_glue