Remove IDBCursorBackendInterface::deleteFunction (part 2/3)

content/common_child/indexed_db/indexed_db_dispatcher.h

 // 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.
 
 #ifndef CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 #define CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 42 matching lines @@
 
   // webkit_glue::WorkerTaskRunner::Observer implementation.
   virtual void OnWorkerRunLoopStopped() OVERRIDE;
 
   static WebKit::WebIDBMetadata ConvertMetadata(
       const IndexedDBDatabaseMetadata& idb_metadata);
 
   void OnMessageReceived(const IPC::Message& msg);
   static bool Send(IPC::Message* msg);
 
-  void RequestIDBFactoryGetDatabaseNames(
-      WebKit::WebIDBCallbacks* callbacks,
-      const string16& database_identifier);
+  void RequestIDBFactoryGetDatabaseNames(WebKit::WebIDBCallbacks* callbacks,

[jsbell, 2013/06/03 17:52:27]

This (and subsequent diffs) are c/o clang-format.

+                                         const string16& database_identifier);
 
   void RequestIDBFactoryOpen(
       const string16& name,
       int64 version,
       int64 transaction_id,
       WebKit::WebIDBCallbacks* callbacks,
       WebKit::WebIDBDatabaseCallbacks* database_callbacks,
       const string16& database_identifier);
 
-  void RequestIDBFactoryDeleteDatabase(
-      const string16& name,
-      WebKit::WebIDBCallbacks* callbacks,
-      const string16& database_identifier);
+  void RequestIDBFactoryDeleteDatabase(const string16& name,
+                                       WebKit::WebIDBCallbacks* callbacks,
+                                       const string16& database_identifier);
 
-  void RequestIDBCursorAdvance(
-      unsigned long count,
-      WebKit::WebIDBCallbacks* callbacks_ptr,
-      int32 ipc_cursor_id);
+  void RequestIDBCursorAdvance(unsigned long count,
+                               WebKit::WebIDBCallbacks* callbacks_ptr,
+                               int32 ipc_cursor_id);
 
-  virtual void RequestIDBCursorContinue(
-      const IndexedDBKey& key,
-      WebKit::WebIDBCallbacks* callbacks_ptr,
-      int32 ipc_cursor_id);
+  virtual void RequestIDBCursorContinue(const IndexedDBKey& key,
+                                        WebKit::WebIDBCallbacks* callbacks_ptr,
+                                        int32 ipc_cursor_id);
 
-  virtual void RequestIDBCursorPrefetch(
-      int n,
-      WebKit::WebIDBCallbacks* callbacks_ptr,
-      int32 ipc_cursor_id);
+  virtual void RequestIDBCursorPrefetch(int n,
+                                        WebKit::WebIDBCallbacks* callbacks_ptr,
+                                        int32 ipc_cursor_id);
 
-  void RequestIDBCursorPrefetchReset(int used_prefetches, int unused_prefetches,
+  void RequestIDBCursorPrefetchReset(int used_prefetches,
+                                     int unused_prefetches,
                                      int32 ipc_cursor_id);
 
-  void RequestIDBCursorDelete(

[jsbell, 2013/06/03 17:52:27]

This is the only real change in the file.

-      WebKit::WebIDBCallbacks* callbacks_ptr,
-      int32 ipc_cursor_id);
-
-  void RequestIDBDatabaseClose(
-      int32 ipc_database_id,
-      int32 ipc_database_callbacks_id);
+  void RequestIDBDatabaseClose(int32 ipc_database_id,
+                               int32 ipc_database_callbacks_id);
 
   void RequestIDBDatabaseCreateTransaction(
       int32 ipc_database_id,
       int64 transaction_id,
       WebKit::WebIDBDatabaseCallbacks* database_callbacks_ptr,
       WebKit::WebVector<long long> object_store_ids,
       unsigned short mode);
 
-  void RequestIDBDatabaseGet(
-      int32 ipc_database_id,
-      int64 transaction_id,
-      int64 object_store_id,
-      int64 index_id,
-      const IndexedDBKeyRange& key_range,
-      bool key_only,
-      WebKit::WebIDBCallbacks* callbacks);
+  void RequestIDBDatabaseGet(int32 ipc_database_id,
+                             int64 transaction_id,
+                             int64 object_store_id,
+                             int64 index_id,
+                             const IndexedDBKeyRange& key_range,
+                             bool key_only,
+                             WebKit::WebIDBCallbacks* callbacks);
 
   void RequestIDBDatabasePut(
       int32 ipc_database_id,
       int64 transaction_id,
       int64 object_store_id,
       const WebKit::WebData& value,
       const IndexedDBKey& key,
       WebKit::WebIDBDatabase::PutMode put_mode,
       WebKit::WebIDBCallbacks* callbacks,
       const WebKit::WebVector<long long>& index_ids,
-      const WebKit::WebVector<WebKit::WebVector<
-          WebKit::WebIDBKey> >& index_keys);
+      const WebKit::WebVector<WebKit::WebVector<WebKit::WebIDBKey> >&
+          index_keys);
 
-  void RequestIDBDatabaseOpenCursor(
-      int32 ipc_database_id,
-      int64 transaction_id,
-      int64 object_store_id,
-      int64 index_id,
-      const IndexedDBKeyRange& key_range,
-      unsigned short direction,
-      bool key_only,
-      WebKit::WebIDBDatabase::TaskType task_type,
-      WebKit::WebIDBCallbacks* callbacks);
+  void RequestIDBDatabaseOpenCursor(int32 ipc_database_id,
+                                    int64 transaction_id,
+                                    int64 object_store_id,
+                                    int64 index_id,
+                                    const IndexedDBKeyRange& key_range,
+                                    unsigned short direction,
+                                    bool key_only,
+                                    WebKit::WebIDBDatabase::TaskType task_type,
+                                    WebKit::WebIDBCallbacks* callbacks);
 
-  void RequestIDBDatabaseCount(
-      int32 ipc_database_id,
-      int64 transaction_id,
-      int64 object_store_id,
-      int64 index_id,
-      const IndexedDBKeyRange& key_range,
-      WebKit::WebIDBCallbacks* callbacks);
+  void RequestIDBDatabaseCount(int32 ipc_database_id,
+                               int64 transaction_id,
+                               int64 object_store_id,
+                               int64 index_id,
+                               const IndexedDBKeyRange& key_range,
+                               WebKit::WebIDBCallbacks* callbacks);
 
-  void RequestIDBDatabaseDeleteRange(
-      int32 ipc_database_id,
-      int64 transaction_id,
-      int64 object_store_id,
-      const IndexedDBKeyRange& key_range,
-      WebKit::WebIDBCallbacks* callbacks);
+  void RequestIDBDatabaseDeleteRange(int32 ipc_database_id,
+                                     int64 transaction_id,
+                                     int64 object_store_id,
+                                     const IndexedDBKeyRange& key_range,
+                                     WebKit::WebIDBCallbacks* callbacks);
 
-  void RequestIDBDatabaseClear(
-      int32 ipc_database_id,
-      int64 transaction_id,
-      int64 object_store_id,
-      WebKit::WebIDBCallbacks* callbacks);
+  void RequestIDBDatabaseClear(int32 ipc_database_id,
+                               int64 transaction_id,
+                               int64 object_store_id,
+                               WebKit::WebIDBCallbacks* callbacks);
 
   virtual void CursorDestroyed(int32 ipc_cursor_id);
   void DatabaseDestroyed(int32 ipc_database_id);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(IndexedDBDispatcherTest, ValueSizeTest);
 
   static int32 CurrentWorkerId() {
     return webkit_glue::WorkerTaskRunner::Instance()->CurrentWorkerId();
   }
 
-  template<typename T>
+  template <typename T>
   void init_params(T& params, WebKit::WebIDBCallbacks* callbacks_ptr) {
     scoped_ptr<WebKit::WebIDBCallbacks> callbacks(callbacks_ptr);
     params.ipc_thread_id = CurrentWorkerId();
     params.ipc_callbacks_id = pending_callbacks_.Add(callbacks.release());
   }
 
   // IDBCallback message handlers.
   void OnSuccessIDBDatabase(int32 ipc_thread_id,
                             int32 ipc_callbacks_id,
                             int32 ipc_database_callbacks_id,
                             int32 ipc_object_id,
                             const IndexedDBDatabaseMetadata& idb_metadata);
   void OnSuccessIndexedDBKey(int32 ipc_thread_id,
                              int32 ipc_callbacks_id,
                              const IndexedDBKey& key);
 
   void OnSuccessOpenCursor(
       const IndexedDBMsg_CallbacksSuccessIDBCursor_Params& p);
   void OnSuccessCursorContinue(
       const IndexedDBMsg_CallbacksSuccessCursorContinue_Params& p);
   void OnSuccessCursorPrefetch(
       const IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params& p);
   void OnSuccessStringList(int32 ipc_thread_id,
                            int32 ipc_callbacks_id,
                            const std::vector<string16>& value);
-  void OnSuccessValue(
-      int32 ipc_thread_id,
-      int32 ipc_callbacks_id,
-      const std::vector<char>& value);
-  void OnSuccessValueWithKey(
-      int32 ipc_thread_id,
-      int32 ipc_callbacks_id,
-      const std::vector<char>& value,
-      const IndexedDBKey& primary_key,
-      const IndexedDBKeyPath& key_path);
-  void OnSuccessInteger(
-      int32 ipc_thread_id,
-      int32 ipc_callbacks_id,
-      int64 value);
-  void OnSuccessUndefined(
-      int32 ipc_thread_id,
-      int32 ipc_callbacks_id);
+  void OnSuccessValue(int32 ipc_thread_id,
+                      int32 ipc_callbacks_id,
+                      const std::vector<char>& value);
+  void OnSuccessValueWithKey(int32 ipc_thread_id,
+                             int32 ipc_callbacks_id,
+                             const std::vector<char>& value,
+                             const IndexedDBKey& primary_key,
+                             const IndexedDBKeyPath& key_path);
+  void OnSuccessInteger(int32 ipc_thread_id,
+                        int32 ipc_callbacks_id,
+                        int64 value);
+  void OnSuccessUndefined(int32 ipc_thread_id, int32 ipc_callbacks_id);
   void OnError(int32 ipc_thread_id,
                int32 ipc_callbacks_id,
                int code,
                const string16& message);
   void OnIntBlocked(int32 ipc_thread_id,
                     int32 ipc_callbacks_id,
                     int64 existing_version);
   void OnUpgradeNeeded(const IndexedDBMsg_CallbacksUpgradeNeeded_Params& p);
   void OnAbort(int32 ipc_thread_id,
                int32 ipc_database_id,
@@ skipping 22 matching lines @@
   std::map<int32, RendererWebIDBCursorImpl*> cursors_;
 
   std::map<int32, RendererWebIDBDatabaseImpl*> databases_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDispatcher);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_CHILD_INDEXED_DB_INDEXED_DB_DISPATCHER_H_