Remove an unnecessary comparison in OriginIdentifierValueMap::EntryMapKey::operator<

chrome/browser/content_settings/content_settings_origin_identifier_value_map.cc

 // Copyright (c) 2011 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/content_settings/content_settings_origin_identifier_value_map.h"
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/values.h"
 #include "chrome/browser/content_settings/content_settings_rule.h"
@@ skipping 40 matching lines @@
 
 OriginIdentifierValueMap::EntryMapKey::EntryMapKey(
     ContentSettingsType content_type,
     ResourceIdentifier resource_identifier)
     : content_type(content_type),
       resource_identifier(resource_identifier) {
 }
 
 bool OriginIdentifierValueMap::EntryMapKey::operator<(
     const OriginIdentifierValueMap::EntryMapKey& other) const {
-  if (content_type < other.content_type)
-    return true;
-  else if (other.content_type > content_type)
-    return false;
+  if (content_type != other.content_type)
+    return content_type < other.content_type;
   return (resource_identifier < other.resource_identifier);
 }
 
 OriginIdentifierValueMap::PatternPair::PatternPair(
     ContentSettingsPattern primary_pattern,
     ContentSettingsPattern secondary_pattern)
     : primary_pattern(primary_pattern),
       secondary_pattern(secondary_pattern) {
 }
 
@@ skipping 89 matching lines @@
 OriginIdentifierValueMap::EntryMap::iterator OriginIdentifierValueMap::erase(
     OriginIdentifierValueMap::EntryMap::iterator entry) {
   // Erasing from the map doesn't invalidate other iterators than the erased
   // one.
   OriginIdentifierValueMap::EntryMap::iterator to_erase = entry++;
   entries_.erase(to_erase);
   return entry;
 }
 
 }  // namespace content_settings