Fix "unreachable code" warnings (MSVC warning 4702) in content/.

content/common/indexed_db/indexed_db_key.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_key.h"
 
 #include <string>
 #include "base/logging.h"
 
 namespace content {
@@ skipping 103 matching lines @@
     return type_ > other.type_ ? -1 : 1;
 
   switch (type_) {
     case WebIDBKeyTypeArray:
       for (size_t i = 0; i < array_.size() && i < other.array_.size(); ++i) {
         if (int result = array_[i].Compare(other.array_[i]))
           return result;
       }
       if (array_.size() < other.array_.size())
         return -1;
-      if (array_.size() > other.array_.size())
-        return 1;
-      return 0;
+      return (array_.size() > other.array_.size()) ? 1 : 0;

[Peter Kasting, 2014/03/18 02:55:54]

(Was trying for a consistent style in this switch -- "if (...) return -1; return
(...) ? 1 : 0;")

+
     case WebIDBKeyTypeBinary:
       return binary_.compare(other.binary_);
+
     case WebIDBKeyTypeString:
       return string_.compare(other.string_);
+
     case WebIDBKeyTypeDate:
-      return (date_ < other.date_) ? -1 : (date_ > other.date_) ? 1 : 0;
+      if (date_ < other.date_)
+        return -1;
+      return (date_ > other.date_) ? 1 : 0;
+
     case WebIDBKeyTypeNumber:
-      return (number_ < other.number_) ? -1 : (number_ > other.number_) ? 1 : 0;
+      if (number_ < other.number_)
+        return -1;
+      return (number_ > other.number_) ? 1 : 0;
+
     case WebIDBKeyTypeInvalid:
     case WebIDBKeyTypeNull:
     case WebIDBKeyTypeMin:
     default:
       NOTREACHED();
       return 0;
   }
-  NOTREACHED();
-  return 0;
 }
 
 bool IndexedDBKey::IsLessThan(const IndexedDBKey& other) const {
   return Compare(other) < 0;
 }
 
 bool IndexedDBKey::IsEqual(const IndexedDBKey& other) const {
   return !Compare(other);
 }
 
 bool IndexedDBKey::IsValid() const {
   if (type_ == WebIDBKeyTypeInvalid || type_ == WebIDBKeyTypeNull)
     return false;
 
   if (type_ == WebIDBKeyTypeArray) {
     for (size_t i = 0; i < array_.size(); i++) {
       if (!array_[i].IsValid())
         return false;
     }
   }
 
   return true;
 }
 
 }  // namespace content