Convert to new WebIDBTypes enums and accessors

content/browser/indexed_db/indexed_db_database.cc

 // Copyright (c) 2013 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/browser/indexed_db/indexed_db_database.h"
 
 #include <math.h>
 #include <set>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_index_writer.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #include "content/public/browser/browser_thread.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"
 
 using base::Int64ToString16;
-using WebKit::WebIDBKey;
+using WebKit::WebIDBKeyTypeNumber;
 
 namespace content {
 
 class CreateObjectStoreOperation : public IndexedDBTransaction::Operation {
  public:
   CreateObjectStoreOperation(
       scoped_refptr<IndexedDBBackingStore> backing_store,
       const IndexedDBObjectStoreMetadata& object_store_metadata)
       : backing_store_(backing_store),
         object_store_metadata_(object_store_metadata) {}
@@ skipping 936 matching lines @@
       object_store_id,
       &current_number);
   if (!ok) {
     LOG(ERROR) << "Failed to GetKeyGeneratorCurrentNumber";
     return make_scoped_ptr(new IndexedDBKey());
   }
   if (current_number < 0 || current_number > max_generator_value)
     return make_scoped_ptr(new IndexedDBKey());
 
   return make_scoped_ptr(
-      new IndexedDBKey(current_number, WebIDBKey::NumberType));
+      new IndexedDBKey(current_number, WebIDBKeyTypeNumber));
 }
 
 static bool UpdateKeyGenerator(
     scoped_refptr<IndexedDBBackingStore> backing_store,
     scoped_refptr<IndexedDBTransaction> transaction,
     int64 database_id,
     int64 object_store_id,
     const IndexedDBKey* key,
     bool check_current) {
   DCHECK(key);
-  DCHECK_EQ(WebIDBKey::NumberType, key->type());
+  DCHECK_EQ(WebIDBKeyTypeNumber, key->type());
   return backing_store->MaybeUpdateKeyGeneratorCurrentNumber(
       transaction->BackingStoreTransaction(),
       database_id,
       object_store_id,
       static_cast<int64>(floor(key->number())) + 1,
       check_current);
 }
 
 void IndexedDBDatabase::Put(int64 transaction_id,
                             int64 object_store_id,
@@ skipping 122 matching lines @@
     IndexWriter* index_writer = index_writers[i];
     index_writer->WriteIndexKeys(record_identifier,
                                  backing_store_,
                                  transaction->BackingStoreTransaction(),
                                  database_id_,
                                  object_store_.id);
   }
 
   if (object_store_.auto_increment &&
       put_mode_ != IndexedDBDatabase::CURSOR_UPDATE &&
-      key->type() == WebIDBKey::NumberType) {
+      key->type() == WebIDBKeyTypeNumber) {
     bool ok = UpdateKeyGenerator(backing_store_,
                                  transaction,
                                  database_id_,
                                  object_store_.id,
                                  key.get(),
                                  !key_was_generated);
     if (!ok) {
       callbacks_->OnError(
           IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError,
                                  "Internal error updating key generator."));
@@ skipping 775 matching lines @@
 
 void IndexedDBDatabase::VersionChangeAbortOperation::Perform(
     IndexedDBTransaction* transaction) {
   IDB_TRACE("VersionChangeAbortOperation");
   DCHECK(!transaction);
   database_->metadata_.version = previous_version_;
   database_->metadata_.int_version = previous_int_version_;
 }
 
 }  // namespace content