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

extensions/common/api/sockets/sockets_manifest_permission_unittest.cc

 // Copyright 2014 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 <set>
+#include <tuple>
 
 #include "base/json/json_reader.h"
 #include "base/pickle.h"
 #include "base/values.h"
 #include "extensions/common/api/sockets/sockets_manifest_permission.h"
 #include "extensions/common/manifest_constants.h"
 #include "ipc/ipc_message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using content::SocketPermissionRequest;
@@ skipping 44 matching lines @@
 }
 
 struct CheckFormatEntry {
   CheckFormatEntry(SocketPermissionRequest::OperationType operation_type,
                    std::string host_pattern)
       : operation_type(operation_type), host_pattern(host_pattern) {}
 
   // operators <, == are needed by container std::set and algorithms
   // std::set_includes and std::set_differences.
   bool operator<(const CheckFormatEntry& rhs) const {
-    if (operation_type == rhs.operation_type)
-      return host_pattern < rhs.host_pattern;
-
-    return operation_type < rhs.operation_type;
+    return std::tie(operation_type, host_pattern) <
+           std::tie(rhs.operation_type, rhs.host_pattern);
   }
 
   bool operator==(const CheckFormatEntry& rhs) const {
     return operation_type == rhs.operation_type &&
            host_pattern == rhs.host_pattern;
   }
 
   SocketPermissionRequest::OperationType operation_type;
   std::string host_pattern;
 };
@@ skipping 314 matching lines @@
       new SocketsManifestPermission());
 
   IPC::Message m;
   ipc_perm->Write(&m);
   base::PickleIterator iter(m);
   EXPECT_TRUE(ipc_perm2->Read(&m, &iter));
   EXPECT_TRUE(permission->Equal(ipc_perm2.get()));
 }
 
 }  // namespace extensions