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

content/browser/indexed_db/indexed_db_leveldb_coding.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_leveldb_coding.h"
 
 #include <iterator>
 #include <limits>
 
 #include "base/logging.h"
@@ skipping 292 matching lines @@
 void EncodeDouble(double value, std::string* into) {
   // This always has host endianness.
   const char* p = reinterpret_cast<char*>(&value);
   into->insert(into->end(), p, p + sizeof(value));
 }
 
 void EncodeIDBKey(const IndexedDBKey& value, std::string* into) {
   size_t previous_size = into->size();
   DCHECK(value.IsValid());
   switch (value.type()) {
-    case WebIDBKeyTypeNull:
-    case WebIDBKeyTypeInvalid:
-    case WebIDBKeyTypeMin:
-    default: {
-      NOTREACHED();
-      EncodeByte(kIndexedDBKeyNullTypeByte, into);
-      return;
-    }
     case WebIDBKeyTypeArray: {
       EncodeByte(kIndexedDBKeyArrayTypeByte, into);
       size_t length = value.array().size();
       EncodeVarInt(length, into);
       for (size_t i = 0; i < length; ++i)
         EncodeIDBKey(value.array()[i], into);
       DCHECK_GT(into->size(), previous_size);
       return;
     }
-    case WebIDBKeyTypeBinary: {
+

[jam, 2014/03/19 16:44:36]

nit: the style guide doesn't show blank lines between case statements, so leave
as is

[Peter Kasting, 2014/03/19 21:10:57]

Done.

+    case WebIDBKeyTypeBinary:
       EncodeByte(kIndexedDBKeyBinaryTypeByte, into);
       EncodeBinary(value.binary(), into);
       DCHECK_GT(into->size(), previous_size);
       return;
-    }
-    case WebIDBKeyTypeString: {
+
+    case WebIDBKeyTypeString:
       EncodeByte(kIndexedDBKeyStringTypeByte, into);
       EncodeStringWithLength(value.string(), into);
       DCHECK_GT(into->size(), previous_size);
       return;
-    }
-    case WebIDBKeyTypeDate: {
+
+    case WebIDBKeyTypeDate:
       EncodeByte(kIndexedDBKeyDateTypeByte, into);
       EncodeDouble(value.date(), into);
       DCHECK_EQ(9u, static_cast<size_t>(into->size() - previous_size));
       return;
-    }
-    case WebIDBKeyTypeNumber: {
+
+    case WebIDBKeyTypeNumber:
       EncodeByte(kIndexedDBKeyNumberTypeByte, into);
       EncodeDouble(value.number(), into);
       DCHECK_EQ(9u, static_cast<size_t>(into->size() - previous_size));
       return;
-    }
+
+    case WebIDBKeyTypeNull:
+    case WebIDBKeyTypeInvalid:
+    case WebIDBKeyTypeMin:
+    default:
+      NOTREACHED();
+      EncodeByte(kIndexedDBKeyNullTypeByte, into);
+      return;
   }
-
-  NOTREACHED();
 }
 
 void EncodeIDBKeyPath(const IndexedDBKeyPath& value, std::string* into) {
   // May be typed, or may be a raw string. An invalid leading
   // byte is used to identify typed coding. New records are
   // always written as typed.
   EncodeByte(kIndexedDBKeyPathTypeCodedByte1, into);
   EncodeByte(kIndexedDBKeyPathTypeCodedByte2, into);
   EncodeByte(static_cast<char>(value.type()), into);
   switch (value.type()) {
@@ skipping 1640 matching lines @@
 scoped_ptr<IndexedDBKey> IndexDataKey::primary_key() const {
   scoped_ptr<IndexedDBKey> key;
   StringPiece slice(encoded_primary_key_);
   if (!DecodeIDBKey(&slice, &key)) {
     // TODO(jsbell): Return error.
   }
   return key.Pass();
 }
 
 }  // namespace content