Remove wstrings in bookmarks, part 5.

chrome/browser/cocoa/bookmark_editor_controller.mm

 // Copyright (c) 2010 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.
 
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #include "app/l10n_util.h"
+#include "base/string16.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 
 @interface BookmarkEditorController (Private)
 
 // Grab the url from the text field and convert.
 - (GURL)GURLFromUrlField;
 
 @end
 
@@ skipping 80 matching lines @@
 }
 
 // The the bookmark's URL is assumed to be valid (otherwise the OK button
 // should not be enabled). Previously existing bookmarks for which the
 // parent has not changed are updated in-place. Those for which the parent
 // has changed are removed with a new node created under the new parent.
 // Called by -[BookmarkEditorBaseController ok:].
 - (NSNumber*)didCommit {
   NSString* name = [[self displayName] stringByTrimmingCharactersInSet:
                     [NSCharacterSet newlineCharacterSet]];
-  std::wstring newTitle = base::SysNSStringToWide(name);
+  string16 newTitle = base::SysNSStringToUTF16(name);
   const BookmarkNode* newParentNode = [self selectedNode];
   GURL newURL = [self GURLFromUrlField];
   if (!newURL.is_valid()) {
     // Shouldn't be reached -- OK button should be disabled if not valid!
     NOTREACHED();
     return [NSNumber numberWithBool:NO];
   }
 
   // Determine where the new/replacement bookmark is to go.
   BookmarkModel* model = [self bookmarkModel];
@@ skipping 14 matching lines @@
   }
   return [NSNumber numberWithBool:YES];
 }
 
 - (NSColor *)urlFieldColor {
   return [urlField_ backgroundColor];
 }
 
 @end  // BookmarkEditorController