Use WebIDBKeyPath type in WebKit API, implement IndexedDBKeyPath type.

content/utility/utility_thread_impl.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 "content/utility/utility_thread_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_vector.h"
 #include "content/common/child_process.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/indexed_db/indexed_db_key.h"
+#include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/utility_messages.h"
 #include "content/common/webkitplatformsupport_impl.h"
 #include "content/public/utility/content_utility_client.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSerializedScriptValue.h"
 #include "webkit/glue/idb_bindings.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
 #if defined(TOOLKIT_GTK)
@@ skipping 62 matching lines @@
     IPC_MESSAGE_HANDLER(UtilityMsg_LoadPlugins, OnLoadPlugins)
 #endif  // OS_POSIX
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void UtilityThreadImpl::OnIDBKeysFromValuesAndKeyPath(
     int id,
     const std::vector<content::SerializedScriptValue>& serialized_script_values,
-    const string16& idb_key_path) {
+    const content::IndexedDBKeyPath& idb_key_path) {
   std::vector<WebKit::WebSerializedScriptValue> web_values;
   ConvertVector(serialized_script_values, &web_values);
   std::vector<WebKit::WebIDBKey> web_keys;
-  bool error = webkit_glue::IDBKeysFromValuesAndKeyPath(
+  webkit_glue::IDBKeysFromValuesAndKeyPath(
       web_values, idb_key_path, &web_keys);
-  if (error) {
-    Send(new UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Failed(id));
-    return;
-  }
   std::vector<IndexedDBKey> keys;
   ConvertVector(web_keys, &keys);
   Send(new UtilityHostMsg_IDBKeysFromValuesAndKeyPath_Succeeded(id, keys));
   ReleaseProcessIfNeeded();
 }
 
 void UtilityThreadImpl::OnInjectIDBKey(
     const IndexedDBKey& key,
     const content::SerializedScriptValue& value,
-    const string16& key_path) {
+    const content::IndexedDBKeyPath& key_path) {
   content::SerializedScriptValue new_value(
       webkit_glue::InjectIDBKey(key, value, key_path));
   Send(new UtilityHostMsg_InjectIDBKey_Finished(new_value));
   ReleaseProcessIfNeeded();
 }
 
 void UtilityThreadImpl::OnBatchModeStarted() {
   batch_mode_ = true;
 }
 
@@ skipping 28 matching lines @@
     webkit::WebPluginInfo plugin;
     if (!plugin_list->LoadPlugin(plugin_paths[i], &plugin_groups, &plugin))
       Send(new UtilityHostMsg_LoadPluginFailed(i, plugin_paths[i]));
     else
       Send(new UtilityHostMsg_LoadedPlugin(i, plugin));
   }
 
   ReleaseProcessIfNeeded();
 }
 #endif