Use same special handling for NTP location bar in non-incognito.

Show a fake placeholder and hide the share button on the non-incognito
new tab page.

Bug: None
Cq-Include-Trybots: luci.chromium.try:ios-simulator-full-configs;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: I1502112b15c60ad1f0844c71baa9461d87192423
Reviewed-on: https://chromium-review.googlesource.com/1115128Reviewed-by: Justin Cohen <justincohen@chromium.org>
Commit-Queue: Stepan Khapugin <stkhapugin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570838}

ios/chrome/browser/ui/location_bar/location_bar_coordinator.mm

@@ -282,7 +282,7 @@ const int kLocationAuthorizationStatusCount = 4;
 - (void)updateLocationText:(NSString*)text {
   [self.omniboxCoordinator updateOmniboxState];
   [self.viewController updateLocationText:text];
-  [self.viewController updateForIncognitoNTP:NO];
+  [self.viewController updateForNTP:NO];
 }
 
 - (void)defocusOmnibox {
@@ -294,10 +294,7 @@ const int kLocationAuthorizationStatusCount = 4;
 }
 
 - (void)updateAfterNavigatingToNTP {
-  BOOL isIncognito = self.browserState->IsOffTheRecord();
-  if (isIncognito) {
-    [self.viewController updateForIncognitoNTP:YES];
-  }
+  [self.viewController updateForNTP:YES];
 }
 
 #pragma mark - private

ios/chrome/browser/ui/location_bar/location_bar_view_controller.h

@@ -57,9 +57,9 @@
 // Updates the location text in the non-editing mode.
 - (void)updateLocationText:(NSString*)text;
 // Updates the location view to show a fake placeholder in the steady location
-// view and hides the trailing button if |isIncognitoNTP|. Otherwise, shows the
+// view and hides the trailing button if |isNTP|. Otherwise, shows the
 // location text and the button as normal.
-- (void)updateForIncognitoNTP:(BOOL)isIncognitoNTP;
+- (void)updateForNTP:(BOOL)isNTP;
 
 // Displays the voice search button instead of the share button in steady state,
 // and adds the voice search button to the empty textfield.

ios/chrome/browser/ui/location_bar/location_bar_view_controller.mm

@@ -201,8 +201,8 @@ typedef NS_ENUM(int, TrailingButtonState) {
           [icon imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate]];
 }
 
-- (void)updateForIncognitoNTP:(BOOL)isIncognitoNTP {
-  if (isIncognitoNTP) {
+- (void)updateForNTP:(BOOL)isNTP {
+  if (isNTP) {
     // Display a fake "placeholder".
     NSString* placeholderString =
         l10n_util::GetNSString(IDS_OMNIBOX_EMPTY_HINT);
@@ -213,7 +213,7 @@ typedef NS_ENUM(int, TrailingButtonState) {
         initWithString:placeholderString
             attributes:@{NSForegroundColorAttributeName : placeholderColor}];
   }
-  self.hideShareButtonWhileOnIncognitoNTP = isIncognitoNTP;
+  self.hideShareButtonWhileOnIncognitoNTP = isNTP;
 }
 
 #pragma mark - private