Convert to new WebIDBTypes enums and accessors

content/common/indexed_db/indexed_db_param_traits.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/common/indexed_db/indexed_db_param_traits.h"
 
 #include <string>
 #include <vector>
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #include "ipc/ipc_message_utils.h"
 
 using content::IndexedDBKey;
 using content::IndexedDBKeyPath;
 using content::IndexedDBKeyRange;
 
-using WebKit::WebIDBKey;
-using WebKit::WebIDBKeyPath;
+using WebKit::WebIDBKeyPathTypeArray;
+using WebKit::WebIDBKeyPathTypeNull;
+using WebKit::WebIDBKeyPathTypeString;
+using WebKit::WebIDBKeyType;
+using WebKit::WebIDBKeyTypeArray;
+using WebKit::WebIDBKeyTypeDate;
+using WebKit::WebIDBKeyTypeInvalid;
+using WebKit::WebIDBKeyTypeMin;
+using WebKit::WebIDBKeyTypeNull;
+using WebKit::WebIDBKeyTypeNumber;
+using WebKit::WebIDBKeyTypeString;
 
 namespace IPC {
 
 void ParamTraits<IndexedDBKey>::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
   switch (p.type()) {
-    case WebIDBKey::ArrayType:
+    case WebIDBKeyTypeArray:
       WriteParam(m, p.array());
       return;
-    case WebIDBKey::StringType:
+    case WebIDBKeyTypeString:
       WriteParam(m, p.string());
       return;
-    case WebIDBKey::DateType:
+    case WebIDBKeyTypeDate:
       WriteParam(m, p.date());
       return;
-    case WebIDBKey::NumberType:
+    case WebIDBKeyTypeNumber:
       WriteParam(m, p.number());
       return;
-    case WebIDBKey::InvalidType:
-    case WebIDBKey::NullType:
+    case WebIDBKeyTypeInvalid:
+    case WebIDBKeyTypeNull:
       return;
-    case WebIDBKey::MinType:
+    case WebIDBKeyTypeMin:
       NOTREACHED();
       return;
   }
 }
 
 bool ParamTraits<IndexedDBKey>::Read(const Message* m,
                                      PickleIterator* iter,
                                      param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
-  WebIDBKey::Type web_type = static_cast<WebIDBKey::Type>(type);
+  WebIDBKeyType web_type = static_cast<WebIDBKeyType>(type);
 
   switch (web_type) {
-    case WebIDBKey::ArrayType: {
+    case WebIDBKeyTypeArray: {
       std::vector<IndexedDBKey> array;
       if (!ReadParam(m, iter, &array))
         return false;
       *r = IndexedDBKey(array);
       return true;
     }
-    case WebIDBKey::StringType: {
+    case WebIDBKeyTypeString: {
       string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKey(string);
       return true;
     }
-    case WebIDBKey::DateType:
-    case WebIDBKey::NumberType: {
+    case WebIDBKeyTypeDate:
+    case WebIDBKeyTypeNumber: {
       double number;
       if (!ReadParam(m, iter, &number))
         return false;
       *r = IndexedDBKey(number, web_type);
       return true;
     }
-    case WebIDBKey::InvalidType:
-    case WebIDBKey::NullType:
+    case WebIDBKeyTypeInvalid:
+    case WebIDBKeyTypeNull:
       *r = IndexedDBKey(web_type);
       return true;
-    case WebIDBKey::MinType:
+    case WebIDBKeyTypeMin:
       NOTREACHED();
       return false;
   }
   NOTREACHED();
   return false;
 }
 
 void ParamTraits<IndexedDBKey>::Log(const param_type& p, std::string* l) {
   l->append("<IndexedDBKey>(");
   LogParam(static_cast<int>(p.type()), l);
@@ skipping 11 matching lines @@
   l->append(", ");
   LogParam(p.date(), l);
   l->append(", ");
   LogParam(p.number(), l);
   l->append(")");
 }
 
 void ParamTraits<IndexedDBKeyPath>::Write(Message* m, const param_type& p) {
   WriteParam(m, static_cast<int>(p.type()));
   switch (p.type()) {
-    case WebIDBKeyPath::ArrayType:
+    case WebIDBKeyPathTypeArray:
       WriteParam(m, p.array());
       return;
-    case WebIDBKeyPath::StringType:
+    case WebIDBKeyPathTypeString:
       WriteParam(m, p.string());
       return;
-    case WebIDBKeyPath::NullType:
+    case WebIDBKeyPathTypeNull:
       return;
   }
   NOTREACHED();
 }
 
 bool ParamTraits<IndexedDBKeyPath>::Read(const Message* m,
                                          PickleIterator* iter,
                                          param_type* r) {
   int type;
   if (!ReadParam(m, iter, &type))
     return false;
 
   switch (type) {
-    case WebIDBKeyPath::ArrayType: {
+    case WebIDBKeyPathTypeArray: {
       std::vector<string16> array;
       if (!ReadParam(m, iter, &array))
         return false;
       *r = IndexedDBKeyPath(array);
       return true;
     }
-    case WebIDBKeyPath::StringType: {
+    case WebIDBKeyPathTypeString: {
       string16 string;
       if (!ReadParam(m, iter, &string))
         return false;
       *r = IndexedDBKeyPath(string);
       return true;
     }
-    case WebIDBKeyPath::NullType:
+    case WebIDBKeyPathTypeNull:
       *r = IndexedDBKeyPath();
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 void ParamTraits<IndexedDBKeyPath>::Log(const param_type& p, std::string* l) {
   l->append("<IndexedDBKeyPath>(");
   LogParam(static_cast<int>(p.type()), l);
@@ skipping 47 matching lines @@
   l->append(", upper=");
   LogParam(p.upper(), l);
   l->append(", lower_open=");
   LogParam(p.lowerOpen(), l);
   l->append(", upper_open=");
   LogParam(p.upperOpen(), l);
   l->append(")");
 }
 
 }  // namespace IPC