Use std::tie() for operator< in content/

content/browser/media/webrtc_identity_store_backend.cc

 // Copyright 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/media/webrtc_identity_store_backend.h"
 
+#include <tuple>
+
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/memory/scoped_vector.h"
 #include "base/strings/string_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/base/net_errors.h"
 #include "sql/statement.h"
 #include "sql/transaction.h"
 #include "storage/browser/quota/special_storage_policy.h"
 #include "url/gurl.h"
@@ skipping 29 matching lines @@
       "certificate BLOB NOT NULL,"
       "private_key BLOB NOT NULL,"
       "creation_time INTEGER)");
 }
 
 struct WebRTCIdentityStoreBackend::IdentityKey {
   IdentityKey(const GURL& origin, const std::string& identity_name)
       : origin(origin), identity_name(identity_name) {}
 
   bool operator<(const IdentityKey& other) const {
-    return origin < other.origin ||
-           (origin == other.origin && identity_name < other.identity_name);
+    return std::tie(origin, identity_name) <
+           std::tie(other.origin, other.identity_name);
   }
 
   GURL origin;
   std::string identity_name;
 };
 
 struct WebRTCIdentityStoreBackend::Identity {
   Identity(const std::string& common_name,
            const std::string& certificate,
            const std::string& private_key)
@@ skipping 526 matching lines @@
         NOTREACHED();
         break;
     }
   }
 
   if (!transaction.Commit())
     DVLOG(2) << "Failed to commit the transaction.";
 }
 
 }  // namespace content