From 1e1044497b9c1a3ae42b7ebf046b103d3b42ec44 Mon Sep 17 00:00:00 2001
From: Chuan Ren <renkelvin@gmail.com>
Date: Thu, 11 Jul 2019 15:24:42 -0700
Subject: [PATCH] Remove UISearchDisplayController (#732)

---
 .../FUICountryTableViewController.h           |  2 +-
 .../FUICountryTableViewController.xib         | 24 ++++---------------
 2 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.h b/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.h
index 83f8511982e..6e7217ca986 100644
--- a/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.h
+++ b/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.h
@@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 @interface FUICountryTableViewController : UIViewController
-    <UITableViewDelegate, UITableViewDataSource, UISearchBarDelegate, UISearchDisplayDelegate>
+    <UITableViewDelegate, UITableViewDataSource, UISearchBarDelegate, UISearchResultsUpdating>
 
 @property (nonatomic, weak) id<FUICountryTableViewDelegate> delegate;
 
diff --git a/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.xib b/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.xib
index bdca13b63b0..c32cabadedb 100644
--- a/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.xib
+++ b/PhoneAuth/FirebasePhoneAuthUI/CountryCode/FUICountryTableViewController.xib
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="11762" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14835.7" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11757"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14790.5"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUICountryTableViewController">
             <connections>
-                <outlet property="searchDisplayController" destination="KKj-HU-yLZ" id="CZ9-NZ-JAa"/>
                 <outlet property="tableView" destination="hg9-yI-N8Q" id="iLe-xV-T7Y"/>
                 <outlet property="view" destination="YSO-gq-Bsm" id="kL7-u3-M1t"/>
             </connections>
@@ -37,20 +34,7 @@
                 <constraint firstAttribute="trailing" secondItem="hg9-yI-N8Q" secondAttribute="trailing" id="NbC-PZ-M9d"/>
                 <constraint firstItem="hg9-yI-N8Q" firstAttribute="leading" secondItem="YSO-gq-Bsm" secondAttribute="leading" id="Tky-AD-NeZ"/>
             </constraints>
-            <point key="canvasLocation" x="245" y="10"/>
+            <point key="canvasLocation" x="355.07246376811599" y="6.6964285714285712"/>
         </view>
-        <searchDisplayController id="KKj-HU-yLZ">
-            <connections>
-                <outlet property="delegate" destination="-1" id="oSi-5i-bxx"/>
-                <outlet property="searchContentsController" destination="-1" id="Gx5-pe-LQj"/>
-                <outlet property="searchResultsDataSource" destination="-1" id="fJy-6f-hb4"/>
-                <outlet property="searchResultsDelegate" destination="-1" id="PrO-fG-8Wj"/>
-            </connections>
-        </searchDisplayController>
     </objects>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4_7.fullscreen"/>
-    </simulatedMetricsContainer>
 </document>