IndexedDB: Simplify data loss code/message routing

content/browser/indexed_db/indexed_db_callbacks.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_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 39 matching lines @@
 
   virtual void OnError(const IndexedDBDatabaseError& error);
 
   // IndexedDBFactory::GetDatabaseNames
   virtual void OnSuccess(const std::vector<base::string16>& string);
 
   // IndexedDBFactory::Open / DeleteDatabase
   virtual void OnBlocked(int64 existing_version);
 
   // IndexedDBFactory::Open
+  virtual void OnDataLoss(blink::WebIDBDataLoss data_loss,
+                          std::string data_loss_message);
   virtual void OnUpgradeNeeded(
       int64 old_version,
       scoped_ptr<IndexedDBConnection> connection,
-      const content::IndexedDBDatabaseMetadata& metadata,
-      blink::WebIDBDataLoss data_loss,
-      std::string data_loss_message);
+      const content::IndexedDBDatabaseMetadata& metadata);
   virtual void OnSuccess(scoped_ptr<IndexedDBConnection> connection,
                          const content::IndexedDBDatabaseMetadata& metadata);
 
   // IndexedDBDatabase::OpenCursor
   virtual void OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
                          const IndexedDBKey& key,
                          const IndexedDBKey& primary_key,
                          std::string* value);
 
   // IndexedDBCursor::Continue / Advance
@@ skipping 18 matching lines @@
   // IndexedDBDatabase::Put / IndexedDBCursor::Update
   virtual void OnSuccess(const IndexedDBKey& value);
 
   // IndexedDBDatabase::Count
   virtual void OnSuccess(int64 value);
 
   // IndexedDBDatabase::Delete
   // IndexedDBCursor::Continue / Advance (when complete)
   virtual void OnSuccess();
 
+  blink::WebIDBDataLoss data_loss() const { return data_loss_; }
+
  protected:
   virtual ~IndexedDBCallbacks();
 
  private:
   friend class base::RefCounted<IndexedDBCallbacks>;
 
   // Originally from IndexedDBCallbacks:
   scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
   int32 ipc_callbacks_id_;
   int32 ipc_thread_id_;
 
   // IndexedDBCursor callbacks ------------------------
   int32 ipc_cursor_id_;
 
   // IndexedDBDatabase callbacks ------------------------
   int64 host_transaction_id_;
   GURL origin_url_;
   int32 ipc_database_id_;
   int32 ipc_database_callbacks_id_;
+
+  // Stored in OnDataLoss, merged with OnUpgradeNeeded response.
+  blink::WebIDBDataLoss data_loss_;
+  std::string data_loss_message_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_