AutoFillField::set_heuristic_type: don't try to handle a DCHECK failure

chrome/browser/autofill/autofill_field.cc

 // Copyright (c) 2010 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 "chrome/browser/autofill/autofill_field.h"
 
 #include "base/logging.h"
 #include "base/sha1.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
@@ skipping 23 matching lines @@
                              const string16& unique_name)
     : webkit_glue::FormField(field),
       unique_name_(unique_name),
       server_type_(NO_SERVER_DATA),
       heuristic_type_(UNKNOWN_TYPE) {
 }
 
 AutoFillField::~AutoFillField() {}
 
 void AutoFillField::set_heuristic_type(const AutoFillFieldType& type) {
-  DCHECK(type >= 0 && type < MAX_VALID_FIELD_TYPE);
-  if (type >= 0 && type < MAX_VALID_FIELD_TYPE)
+  if (type >= 0 && type < MAX_VALID_FIELD_TYPE) {
     heuristic_type_ = type;
-  else
+  } else {
+    NOTREACHED();
+    // This case should not be reachable; but since this has potential
+    // implications on data uploaded to the server, better safe than sorry.
     heuristic_type_ = UNKNOWN_TYPE;
+  }
 }
 
 AutoFillFieldType AutoFillField::type() const {
   if (server_type_ != NO_SERVER_DATA)
     return server_type_;
 
   return heuristic_type_;
 }
 
 bool AutoFillField::IsEmpty() const {
   return value().empty();
 }
 
 std::string AutoFillField::FieldSignature() const {
   std::string field_name = UTF16ToUTF8(name());
   std::string type = UTF16ToUTF8(form_control_type());
   std::string field_string = field_name + "&" + type;
   return Hash32Bit(field_string);
 }
 
 bool AutoFillField::IsFieldFillable() const {
   return type() != UNKNOWN_TYPE;
 }