IndexedDB: Created IndexedDBDataLossInfo.

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 <stdint.h>
 
 #include <memory>
@@ skipping 13 matching lines @@
 namespace content {
 class IndexedDBBlobInfo;
 class IndexedDBConnection;
 class IndexedDBCursor;
 class IndexedDBDatabase;
 class IndexedDBDatabaseCallbacks;
 struct IndexedDBDatabaseMetadata;
 struct IndexedDBReturnValue;
 struct IndexedDBValue;
 
+struct IndexedDBDataLossInfo {
+  blink::WebIDBDataLoss status = blink::WebIDBDataLossNone;
+  std::string message;
+};
+
 class CONTENT_EXPORT IndexedDBCallbacks
     : public base::RefCounted<IndexedDBCallbacks> {
  public:
   // Simple payload responses
   IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
                      int32_t ipc_thread_id,
                      int32_t ipc_callbacks_id);
 
   // IndexedDBCursor responses
   IndexedDBCallbacks(IndexedDBDispatcherHost* dispatcher_host,
@@ skipping 11 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_t existing_version);
 
   // IndexedDBFactory::Open
-  virtual void OnDataLoss(blink::WebIDBDataLoss data_loss,
-                          std::string data_loss_message);
+  virtual void OnDataLoss(const IndexedDBDataLossInfo& data_loss_info);
   virtual void OnUpgradeNeeded(
       int64_t old_version,
       std::unique_ptr<IndexedDBConnection> connection,
       const content::IndexedDBDatabaseMetadata& metadata);
   virtual void OnSuccess(std::unique_ptr<IndexedDBConnection> connection,
                          const content::IndexedDBDatabaseMetadata& metadata);
 
   // IndexedDBDatabase::OpenCursor
   virtual void OnSuccess(scoped_refptr<IndexedDBCursor> cursor,
                          const IndexedDBKey& key,
@@ skipping 23 matching lines @@
   virtual void OnSuccess(const IndexedDBKey& key);
 
   // IndexedDBDatabase::Count
   // IndexedDBFactory::DeleteDatabase
   // IndexedDBDatabase::DeleteRange
   virtual void OnSuccess(int64_t value);
 
   // IndexedDBCursor::Continue / Advance (when complete)
   virtual void OnSuccess();
 
-  blink::WebIDBDataLoss data_loss() const { return data_loss_; }
+  const IndexedDBDataLossInfo& data_loss_info() const {
+    return data_loss_info_;
+  }
 
   void SetConnectionOpenStartTime(const base::TimeTicks& start_time);
 
  protected:
   virtual ~IndexedDBCallbacks();
 
  private:
   void RegisterBlobsAndSend(const std::vector<IndexedDBBlobInfo>& blob_info,
                             const base::Closure& callback);
 
   friend class base::RefCounted<IndexedDBCallbacks>;
 
   // Originally from IndexedDBCallbacks:
   scoped_refptr<IndexedDBDispatcherHost> dispatcher_host_;
   int32_t ipc_callbacks_id_;
   int32_t ipc_thread_id_;
 
   // IndexedDBCursor callbacks ------------------------
   int32_t ipc_cursor_id_;
 
   // IndexedDBDatabase callbacks ------------------------
   int64_t host_transaction_id_;
   url::Origin origin_;
   int32_t ipc_database_id_;
   int32_t ipc_database_callbacks_id_;
 
-  // Stored in OnDataLoss, merged with OnUpgradeNeeded response.
-  blink::WebIDBDataLoss data_loss_;
-  std::string data_loss_message_;
+  // Used to assert that OnSuccess is only called if there was no data loss.
+  IndexedDBDataLossInfo data_loss_info_;
 
   // The "blocked" event should be sent at most once per request.
   bool sent_blocked_;
   base::TimeTicks connection_open_start_time_;
   DISALLOW_COPY_AND_ASSIGN(IndexedDBCallbacks);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_H_