IndexedDB: Use C++11 in-class member initializers

content/common/indexed_db/indexed_db_key.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_INDEXED_DB_INDEXED_DB_KEY_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_KEY_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
 #include "third_party/WebKit/public/platform/WebIDBTypes.h"
 
 namespace blink {
 class WebIDBKey;
 }
 
 namespace content {
@@ skipping 12 matching lines @@
   IndexedDBKey(const IndexedDBKey& other);
   ~IndexedDBKey();
   IndexedDBKey& operator=(const IndexedDBKey& other);
 
   bool IsValid() const;
 
   bool IsLessThan(const IndexedDBKey& other) const;
   bool Equals(const IndexedDBKey& other) const;
 
   blink::WebIDBKeyType type() const { return type_; }
-  const std::vector<IndexedDBKey>& array() const { return array_; }
-  const std::string& binary() const { return binary_; }
-  const base::string16& string() const { return string_; }
-  double date() const { return date_; }
-  double number() const { return number_; }
+  const std::vector<IndexedDBKey>& array() const {
+    DCHECK(type_ == blink::WebIDBKeyTypeArray);

[cmumford, 2015/04/08 22:16:32]

DCHECK_EQ - also for the others below.

[jsbell, 2015/04/08 23:09:52]

Oops. Done.

+    return array_;
+  }
+  const std::string& binary() const {
+    DCHECK(type_ == blink::WebIDBKeyTypeBinary);
+    return binary_;
+  }
+  const base::string16& string() const {
+    DCHECK(type_ == blink::WebIDBKeyTypeString);
+    return string_;
+  }
+  double date() const {
+    DCHECK(type_ == blink::WebIDBKeyTypeDate);
+    return number_;
+  }
+  double number() const {
+    DCHECK(type_ == blink::WebIDBKeyTypeNumber);
+    return number_;
+  }
 
   size_t size_estimate() const { return size_estimate_; }
 
  private:
   int CompareTo(const IndexedDBKey& other) const;
 
   blink::WebIDBKeyType type_;
   std::vector<IndexedDBKey> array_;
   std::string binary_;
   base::string16 string_;
-  double date_;
-  double number_;
+  double number_ = 0;
 
   size_t size_estimate_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_INDEXED_DB_INDEXED_DB_KEY_H_