Move base/cocoa_protocols_mac.h to base/mac/cocoa_protocols.h

Fix users of this file to use the new location.

TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/6019004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70009 0039d316-1c4b-4281-b951-d872f2087c98

45 files changed, 45 insertions, 45 deletions

diff --git a/chrome/browser/app_controller_mac.h b/chrome/browser/app_controller_mac.h
index 721aefc..02a55b0 100644
--- a/chrome/browser/app_controller_mac.h
+++ b/chrome/browser/app_controller_mac.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 
diff --git a/chrome/browser/autofill/autofill_dialog_controller_mac.h b/chrome/browser/autofill/autofill_dialog_controller_mac.h
index 4ebf2d6..642e811 100644
--- a/chrome/browser/autofill/autofill_dialog_controller_mac.h
+++ b/chrome/browser/autofill/autofill_dialog_controller_mac.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autofill/autofill_dialog.h"
diff --git a/chrome/browser/ui/cocoa/animatable_view.h b/chrome/browser/ui/cocoa/animatable_view.h
index dcf2c26..2bd121a 100644
--- a/chrome/browser/ui/cocoa/animatable_view.h
+++ b/chrome/browser/ui/cocoa/animatable_view.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/background_gradient_view.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller.h b/chrome/browser/ui/cocoa/base_bubble_controller.h
index 7cc2c5b..99b491a 100644
--- a/chrome/browser/ui/cocoa/base_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/base_bubble_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 
 namespace BaseBubbleControllerInternal {
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h
index 1b80d91..cd97d9e 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.h
@@ -7,7 +7,7 @@
 #pragma once
 
 #import <Cocoa/Cocoa.h>
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
index fc2840d..3ed8f7b 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h"
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h
index e126ac3..2e28cf4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_COCOA_BOOKMARKS_BOOKMARK_BUTTON_CELL_H_
 #pragma once
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
 class BookmarkNode;
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
index 50e7413..34e7032 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/bookmarks/bookmark_editor.h"
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h
index 66ecc45..ac7def4 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h
@@ -12,7 +12,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 
 class BookmarkNode;
 class BookmarkMenuBridge;
diff --git a/chrome/browser/ui/cocoa/collected_cookies_mac.h b/chrome/browser/ui/cocoa/collected_cookies_mac.h
index 23647ee..0329819 100644
--- a/chrome/browser/ui/cocoa/collected_cookies_mac.h
+++ b/chrome/browser/ui/cocoa/collected_cookies_mac.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
diff --git a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h
index fccafa9f..b7201e1 100644
--- a/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h
+++ b/chrome/browser/ui/cocoa/confirm_quit_panel_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 
 // The ConfirmQuitPanelController manages the black HUD window that tells users
 // to "Hold Cmd+Q to Quit".
diff --git a/chrome/browser/ui/cocoa/content_exceptions_window_controller.h b/chrome/browser/ui/cocoa/content_exceptions_window_controller.h
index 23d1a98..e5ce74f 100644
--- a/chrome/browser/ui/cocoa/content_exceptions_window_controller.h
+++ b/chrome/browser/ui/cocoa/content_exceptions_window_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/common/content_settings_types.h"
diff --git a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h b/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h
index 201ea12..362f3ea 100644
--- a/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/content_setting_bubble_cocoa.h
@@ -6,7 +6,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/base_bubble_controller.h"
diff --git a/chrome/browser/ui/cocoa/content_settings_dialog_controller.h b/chrome/browser/ui/cocoa/content_settings_dialog_controller.h
index 432a3dc..4fbd59d 100644
--- a/chrome/browser/ui/cocoa/content_settings_dialog_controller.h
+++ b/chrome/browser/ui/cocoa/content_settings_dialog_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "chrome/common/content_settings_types.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
diff --git a/chrome/browser/ui/cocoa/cookie_details_view_controller.h b/chrome/browser/ui/cocoa/cookie_details_view_controller.h
index cad42f4..63fff93 100644
--- a/chrome/browser/ui/cocoa/cookie_details_view_controller.h
+++ b/chrome/browser/ui/cocoa/cookie_details_view_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "net/base/cookie_monster.h"
 
 @class CocoaCookieTreeNode;
diff --git a/chrome/browser/ui/cocoa/cookies_window_controller.h b/chrome/browser/ui/cocoa/cookies_window_controller.h
index 0dd8004..658bfa7 100644
--- a/chrome/browser/ui/cocoa/cookies_window_controller.h
+++ b/chrome/browser/ui/cocoa/cookies_window_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/cookies_tree_model.h"
diff --git a/chrome/browser/ui/cocoa/download/download_item_button.h b/chrome/browser/ui/cocoa/download/download_item_button.h
index c344341..c064cd8 100644
--- a/chrome/browser/ui/cocoa/download/download_item_button.h
+++ b/chrome/browser/ui/cocoa/download/download_item_button.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/file_path.h"
 #import "chrome/browser/ui/cocoa/draggable_button.h"
 
diff --git a/chrome/browser/ui/cocoa/download/download_item_cell.h b/chrome/browser/ui/cocoa/download/download_item_cell.h
index 4f24837..a5ffaeb 100644
--- a/chrome/browser/ui/cocoa/download/download_item_cell.h
+++ b/chrome/browser/ui/cocoa/download/download_item_cell.h
@@ -6,7 +6,7 @@
 #define CHROME_BROWSER_UI_COCOA_DOWNLOAD_DOWNLOAD_ITEM_CELL_H_
 #pragma once
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/gradient_button_cell.h"
 
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller.h b/chrome/browser/ui/cocoa/download/download_shelf_controller.h
index c478439..e75911f 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller.h
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/view_resizer.h"
diff --git a/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h b/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h
index b1bfabc..9db2a4e 100644
--- a/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/edit_search_engine_cocoa_controller.h
@@ -6,7 +6,7 @@
 
 class TemplateURL;
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
diff --git a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h
index 3178d47..63dfc22 100644
--- a/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/extension_installed_bubble_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #include "third_party/skia/include/core/SkBitmap.h"
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
index 91bdba6..d3fb422 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/ui/cocoa/info_bubble_view.h"
diff --git a/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm b/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm
index e9cab87..382a870 100644
--- a/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm
+++ b/chrome/browser/ui/cocoa/find_bar_text_field_unittest.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/find_bar_text_field.h"
 #import "chrome/browser/ui/cocoa/find_bar_text_field_cell.h"
diff --git a/chrome/browser/ui/cocoa/font_language_settings_controller.h b/chrome/browser/ui/cocoa/font_language_settings_controller.h
index 9e03323..3123cd2 100644
--- a/chrome/browser/ui/cocoa/font_language_settings_controller.h
+++ b/chrome/browser/ui/cocoa/font_language_settings_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/prefs/pref_member.h"
 
diff --git a/chrome/browser/ui/cocoa/fullscreen_controller.h b/chrome/browser/ui/cocoa/fullscreen_controller.h
index 2e96b61..474d699 100644
--- a/chrome/browser/ui/cocoa/fullscreen_controller.h
+++ b/chrome/browser/ui/cocoa/fullscreen_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/mac_util.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.h b/chrome/browser/ui/cocoa/hung_renderer_controller.h
index 0d45c0f..584feb8 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.h
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.h
@@ -20,7 +20,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #import "base/scoped_nsobject.h"
 
 @class MultiKeyEquivalentButton;
diff --git a/chrome/browser/ui/cocoa/infobar_controller.h b/chrome/browser/ui/cocoa/infobar_controller.h
index 265700c..e13d211 100644
--- a/chrome/browser/ui/cocoa/infobar_controller.h
+++ b/chrome/browser/ui/cocoa/infobar_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 
 @class AnimatableView;
diff --git a/chrome/browser/ui/cocoa/instant_confirm_window_controller.h b/chrome/browser/ui/cocoa/instant_confirm_window_controller.h
index 223c197..a0f0c2f 100644
--- a/chrome/browser/ui/cocoa/instant_confirm_window_controller.h
+++ b/chrome/browser/ui/cocoa/instant_confirm_window_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 
 class Profile;
 
diff --git a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
index ca10274..5568d70 100644
--- a/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/js_modal_dialog_cocoa.mm
@@ -8,8 +8,8 @@
 
 #include "app/l10n_util_mac.h"
 #include "app/message_box_flags.h"
-#import "base/cocoa_protocols_mac.h"
 #include "base/logging.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/chrome_browser_application_mac.h"
 #include "chrome/browser/ui/app_modal_dialogs/js_modal_dialog.h"
diff --git a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h
index 0934f0d..6acc829 100644
--- a/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h
+++ b/chrome/browser/ui/cocoa/keyword_editor_cocoa_controller.h
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "app/table_model_observer.h"
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/search_engines/edit_search_engine_controller.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
index 884df1b..fa8bd42 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/styled_text_field.h"
 #import "chrome/browser/ui/cocoa/url_drop_target.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
index 14d5476..c85c738 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest.mm
@@ -5,7 +5,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "app/resource_bundle.h"
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.h"
diff --git a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h
index 384337b..321ec61 100644
--- a/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h
+++ b/chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_unittest_helper.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/location_bar/autocomplete_text_field.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.h b/chrome/browser/ui/cocoa/notifications/balloon_controller.h
index c60b9b9..61376b4 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_controller.h
+++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
index 8719387..f0d914e 100644
--- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
+++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm
@@ -7,7 +7,7 @@
 #include "app/l10n_util.h"
 #include "app/mac/nsimage_cache.h"
 #include "app/resource_bundle.h"
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/mac_util.h"
 #import "base/scoped_nsobject.h"
 #include "base/utf_string_conversions.h"
diff --git a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
index 8dcaebed6..257bb62 100644
--- a/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
+++ b/chrome/browser/ui/cocoa/shell_dialogs_mac.mm
@@ -12,9 +12,9 @@
 #include <vector>
 
 #include "app/l10n_util_mac.h"
-#import "base/cocoa_protocols_mac.h"
 #include "base/file_util.h"
 #include "base/logging.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/mac_util.h"
 #include "base/mac/scoped_cftyperef.h"
 #import "base/scoped_nsobject.h"
diff --git a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h
index 13daf99..61fd48c 100644
--- a/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h
+++ b/chrome/browser/ui/cocoa/simple_content_exceptions_window_controller.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/remove_rows_table_model.h"
 #import "chrome/browser/ui/cocoa/table_model_array_controller.h"
diff --git a/chrome/browser/ui/cocoa/styled_text_field_unittest.mm b/chrome/browser/ui/cocoa/styled_text_field_unittest.mm
index dfaaa5fa..6ca36bc 100644
--- a/chrome/browser/ui/cocoa/styled_text_field_unittest.mm
+++ b/chrome/browser/ui/cocoa/styled_text_field_unittest.mm
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/styled_text_field.h"
 #import "chrome/browser/ui/cocoa/styled_text_field_cell.h"
diff --git a/chrome/browser/ui/cocoa/tab_view_picker_table.h b/chrome/browser/ui/cocoa/tab_view_picker_table.h
index 75d943f..b6b80b0 100644
--- a/chrome/browser/ui/cocoa/tab_view_picker_table.h
+++ b/chrome/browser/ui/cocoa/tab_view_picker_table.h
@@ -4,7 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 
 // TabViewPickerTable is an NSOutlineView that can be used to switch between the
diff --git a/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm b/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm
index 4b22b3f..daf1340 100644
--- a/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm
+++ b/chrome/browser/ui/cocoa/tab_view_picker_table_unittest.mm
@@ -6,7 +6,7 @@
 
 #import "chrome/browser/ui/cocoa/tab_view_picker_table.h"
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/ui/cocoa/tab_window_controller.h b/chrome/browser/ui/cocoa/tab_window_controller.h
index eb6cd4b..ea3527c 100644
--- a/chrome/browser/ui/cocoa/tab_window_controller.h
+++ b/chrome/browser/ui/cocoa/tab_window_controller.h
@@ -28,7 +28,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 
 @class FastResizeView;
diff --git a/chrome/browser/ui/cocoa/table_model_array_controller.h b/chrome/browser/ui/cocoa/table_model_array_controller.h
index 11af327..b9b227e 100644
--- a/chrome/browser/ui/cocoa/table_model_array_controller.h
+++ b/chrome/browser/ui/cocoa/table_model_array_controller.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 
 #include "app/table_model_observer.h"
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h
index 9e6e70b..75c9811 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.h
+++ b/chrome/browser/ui/cocoa/task_manager_mac.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #include <vector>
 
-#include "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/browser/ui/cocoa/table_row_nsimage_cache.h"
diff --git a/chrome/browser/ui/cocoa/translate/translate_infobar_base.h b/chrome/browser/ui/cocoa/translate/translate_infobar_base.h
index 306dad1..1dff159 100644
--- a/chrome/browser/ui/cocoa/translate/translate_infobar_base.h
+++ b/chrome/browser/ui/cocoa/translate/translate_infobar_base.h
@@ -9,7 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "chrome/browser/ui/cocoa/infobar_controller.h"
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #import "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #include "chrome/browser/translate/languages_menu_model.h"
diff --git a/chrome/browser/ui/cocoa/wrench_menu_controller.h b/chrome/browser/ui/cocoa/wrench_menu_controller.h
index 5f1d9ca..f2dea7a 100644
--- a/chrome/browser/ui/cocoa/wrench_menu_controller.h
+++ b/chrome/browser/ui/cocoa/wrench_menu_controller.h
@@ -8,7 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
-#import "base/cocoa_protocols_mac.h"
+#import "base/mac/cocoa_protocols.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/ui/cocoa/menu_controller.h"