Use a direct include of strings headers in chrome/browser/ui/cocoa/.

chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.mm

 // Copyright (c) 2009 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.
 
 #include "chrome/browser/ui/cocoa/encoding_menu_controller_delegate_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/string16.h"
+#include "base/strings/string16.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/toolbar/encoding_menu_controller.h"
 
 namespace {
 
 void AddSeparatorToMenu(NSMenu *parent_menu) {
   NSMenuItem* separator = [NSMenuItem separatorItem];
   [parent_menu addItem:separator];
@@ skipping 30 matching lines @@
     if (item_id == 0) {
       AddSeparatorToMenu(encoding_menu);
     } else {
       NSString *localized_title =
           base::SysUTF16ToNSString(localized_title_string16);
       AppendMenuItem(encoding_menu, item_id, localized_title);
     }
   }
 
 }