Fix Chromium iOS compilation with clang@375484

Bug: 1017213
Change-Id: I28221c29e3e69b50a97d47f0f8981e0a516d65b6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1878075
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Sylvain Defresne <sdefresne@chromium.org>
Reviewed-by: Stepan Khapugin <stkhapugin@chromium.org>
Reviewed-by: Yuwei Huang <yuweih@chromium.org>
Cr-Commit-Position: refs/heads/master@{#709871}

ios/chrome/browser/store_kit/store_kit_coordinator_unittest.mm

@@ -58,8 +58,8 @@ TEST_F(StoreKitCoordinatorTest, OpenStoreWithParamsPresentViewController) {
 
   EXPECT_NSEQ(product_params, coordinator_.iTunesProductParameters);
 
-  EXPECT_NSEQ([SKStoreProductViewController class],
-              [base_view_controller_.presentedViewController class]);
+  EXPECT_EQ([SKStoreProductViewController class],
+            [base_view_controller_.presentedViewController class]);
   [coordinator_ stop];
   EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
       base::test::ios::kWaitForActionTimeout, ^bool {
@@ -84,8 +84,8 @@ TEST_F(StoreKitCoordinatorTest, OpenStorePresentViewController) {
 
   EXPECT_NSEQ(product_params, coordinator_.iTunesProductParameters);
 
-  EXPECT_NSEQ([SKStoreProductViewController class],
-              [base_view_controller_.presentedViewController class]);
+  EXPECT_EQ([SKStoreProductViewController class],
+            [base_view_controller_.presentedViewController class]);
 
   [coordinator_ stop];
   EXPECT_TRUE(base::test::ios::WaitUntilConditionOrTimeout(
@@ -109,8 +109,8 @@ TEST_F(StoreKitCoordinatorTest, NoOverlappingStoreKitsPresented) {
         return base_view_controller_.presentedViewController;
       }));
 
-  EXPECT_NSEQ([SKStoreProductViewController class],
-              [base_view_controller_.presentedViewController class]);
+  EXPECT_EQ([SKStoreProductViewController class],
+            [base_view_controller_.presentedViewController class]);
 
   UIViewController* presented_controller =
       base_view_controller_.presentedViewController;
@@ -136,8 +136,8 @@ TEST_F(StoreKitCoordinatorTest, NoOverlappingStoreKitsPresented) {
 
   // After reseting the view controller, a new storekit view should be
   // presented.
-  EXPECT_NSEQ([SKStoreProductViewController class],
-              [base_view_controller_.presentedViewController class]);
+  EXPECT_EQ([SKStoreProductViewController class],
+            [base_view_controller_.presentedViewController class]);
   EXPECT_NSNE(presented_controller,
               base_view_controller_.presentedViewController);
 }
@@ -190,6 +190,6 @@ TEST_F(StoreKitCoordinatorTest, MAYBE_NoOverlappingPresentedViewControllers) {
 
   // After reseting the view controller, a new storekit view should be
   // presented.
-  EXPECT_NSEQ([SKStoreProductViewController class],
-              [base_view_controller_.presentedViewController class]);
+  EXPECT_EQ([SKStoreProductViewController class],
+            [base_view_controller_.presentedViewController class]);
 }

ios/chrome/browser/ui/reading_list/reading_list_egtest.mm

@@ -193,8 +193,8 @@ void PerformActionOnEntry(const std::string& entryTitle,
                  grey_sufficientlyVisible(), nil);
   [[[EarlGrey selectElementWithMatcher:matcher]
          usingSearchAction:grey_scrollInDirection(kGREYDirectionDown, 100)
-      onElementWithMatcher:grey_accessibilityID(
-                               [ReadingListTableViewController class])]
+      onElementWithMatcher:grey_accessibilityID([[ReadingListTableViewController
+                               class] accessibilityIdentifier])]
       performAction:action];
 }
 

ios/chrome/browser/ui/settings/credit_card_scanner/credit_card_scanner_camera_controller.mm

@@ -38,7 +38,7 @@
 - (void)configureScannerWithSession:(AVCaptureSession*)session {
   // Configure camera output.
   NSDictionary* outputSettings = @{
-    (id)kCVPixelBufferPixelFormatTypeKey :
+    (__bridge NSString*)kCVPixelBufferPixelFormatTypeKey :
         [NSNumber numberWithInteger:kCVPixelFormatType_32BGRA]
   };
   AVCaptureVideoDataOutput* videoOutput =

ios/chrome/test/earl_grey/chrome_test_case.mm

@@ -386,7 +386,8 @@ GREY_STUB_CLASS_IN_APP_MAIN_QUEUE(ChromeTestCaseAppInterface)
 // Dismisses and revert browser settings to default.
 // It also starts the HTTP server and enables mock authentication.
 + (void)setUpHelper {
-  XCTAssertTrue([ChromeEarlGrey isCustomWebKitLoadedIfRequested]);
+  GREYAssertTrue([ChromeEarlGrey isCustomWebKitLoadedIfRequested],
+                 @"Unable to load custom WebKit");
 
   [CoverageUtils configureCoverageReportPath];
 

remoting/ios/persistence/remoting_keychain_unittest.mm

@@ -38,8 +38,8 @@ NSString* KeyToService(Keychain::Key key) {
 
 void RemoveAllKeychainsForKey(Keychain::Key key) {
   NSDictionary* remove_all_query = @{
-    (__bridge id)kSecClass : (__bridge id)kSecClassGenericPassword,
-    (__bridge id)kSecAttrService : KeyToService(key)
+    (__bridge NSString*)kSecClass : (__bridge id)kSecClassGenericPassword,
+    (__bridge NSString*)kSecAttrService : KeyToService(key)
   };
   OSStatus status = SecItemDelete((__bridge CFDictionaryRef)remove_all_query);
   ASSERT_TRUE(status == errSecSuccess || status == errSecItemNotFound);
@@ -47,9 +47,9 @@ void RemoveAllKeychainsForKey(Keychain::Key key) {
 
 void VerifyNoKeychainForKey(Keychain::Key key) {
   NSDictionary* get_all_query = @{
-    (__bridge id)kSecClass : (__bridge id)kSecClassGenericPassword,
-    (__bridge id)kSecAttrService : KeyToService(key),
-    (__bridge id)kSecReturnData : @YES,
+    (__bridge NSString*)kSecClass : (__bridge id)kSecClassGenericPassword,
+    (__bridge NSString*)kSecAttrService : KeyToService(key),
+    (__bridge NSString*)kSecReturnData : @YES,
   };
   base::ScopedCFTypeRef<CFTypeRef> cf_result;
   OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)get_all_query,