Update from https://crrev.com/320343

base/win/scoped_comptr_unittest.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 "base/win/scoped_comptr.h"
 
 #include <shlobj.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_com_initializer.h"
@@ skipping 13 matching lines @@
   int releases;
 };
 
 extern const IID dummy_iid;
 const IID dummy_iid = { 0x12345678u, 0x1234u, 0x5678u, 01, 23, 45, 67, 89,
                         01, 23, 45 };
 
 }  // namespace
 
 TEST(ScopedComPtrTest, ScopedComPtr) {
-  EXPECT_TRUE(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown,
-                     sizeof(IID)) == 0);
+  EXPECT_EQ(memcmp(&ScopedComPtr<IUnknown>::iid(), &IID_IUnknown, sizeof(IID)),
+            0);
 
   base::win::ScopedCOMInitializer com_initializer;
   EXPECT_TRUE(com_initializer.succeeded());
 
   ScopedComPtr<IUnknown> unk;
   EXPECT_TRUE(SUCCEEDED(unk.CreateInstance(CLSID_ShellLink)));
   ScopedComPtr<IUnknown> unk2;
   unk2.Attach(unk.Detach());
   EXPECT_TRUE(unk.get() == NULL);
   EXPECT_TRUE(unk2.get() != NULL);
@@ skipping 56 matching lines @@
     bleh.pop_back();
     EXPECT_EQ(p->adds, 4);
     EXPECT_EQ(p->releases, 2);
   }
   EXPECT_EQ(p->adds, 4);
   EXPECT_EQ(p->releases, 4);
 }
 
 }  // namespace win
 }  // namespace base