[Mac] Fix for Bookmark Editor Crash

Using field editors is finicky especially when
there's multiple textfields. Using one field editor
is enough, so this CL combines the name and URL
field editors into one.

In addition, like what the
AutocompleteTextFieldEditor is doing, the field
editor's fieldEditor property will reset each time
windowWillReturnFieldEditor:toObject: is called so
that notifications will be sent properly.

Bug: 744211
Change-Id: I2367d2abc788aaf1ef3daa037c879a222440015a
Reviewed-on: https://chromium-review.googlesource.com/595214Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Sarah Chan <spqchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#491072}

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.h

@@ -20,9 +20,8 @@
   IBOutlet NSTextField* urlField_;
   IBOutlet NSTextField* nameTextField_;
 
-  // Field editors for |urlField_| and |nameTextField_|.
-  base::scoped_nsobject<DialogTextFieldEditor> urlFieldEditor_;
-  base::scoped_nsobject<DialogTextFieldEditor> nameFieldEditor_;
+  // Field editor for |urlField_| and |nameTextField_|.
+  base::scoped_nsobject<DialogTextFieldEditor> touchBarFieldEditor_;
 }
 
 @property(nonatomic, copy) NSString* displayURL;

chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller.mm

@@ -49,8 +49,7 @@ using bookmarks::BookmarkNode;
                             configuration:configuration])) {
     // "Add Page..." has no "node" so this may be NULL.
     node_ = node;
-    urlFieldEditor_.reset([[DialogTextFieldEditor alloc] init]);
-    nameFieldEditor_.reset([[DialogTextFieldEditor alloc] init]);
+    touchBarFieldEditor_.reset([[DialogTextFieldEditor alloc] init]);
   }
   return self;
 }
@@ -85,19 +84,14 @@ using bookmarks::BookmarkNode;
 }
 
 - (void)windowWillClose:(NSNotification*)notification {
-  [urlFieldEditor_ setFieldEditor:NO];
-  [nameFieldEditor_ setFieldEditor:NO];
-
-  urlFieldEditor_.reset();
-  nameFieldEditor_.reset();
+  [touchBarFieldEditor_ setFieldEditor:NO];
+  touchBarFieldEditor_.reset();
   [super windowWillClose:notification];
 }
 
 - (id)windowWillReturnFieldEditor:(NSWindow*)sender toObject:(id)obj {
-  if (obj == urlField_)
-    return urlFieldEditor_.get();
-  else if (obj == nameTextField_)
-    return nameFieldEditor_.get();
+  if (obj == urlField_ || obj == nameTextField_)
+    return touchBarFieldEditor_.get();
 
   return nil;
 }