Roll GTM r330:375.

base/cocoa_protocols_mac.h

Index: base/cocoa_protocols_mac.h
diff --git a/base/cocoa_protocols_mac.h b/base/cocoa_protocols_mac.h
index a98d47225ce950ed722de5e637a834bf17ea50bf..ce3845dee0849e63a1960a8b0fa000555df8320e 100644
--- a/base/cocoa_protocols_mac.h
+++ b/base/cocoa_protocols_mac.h
@@ -7,6 +7,10 @@
 
 #import <Cocoa/Cocoa.h>
 
+// GTM also maintinas a list of empty protocols, but only the ones the library
+// requires. Augment that below.
+#import "third_party/GTM/GTMDefines.h"
+
 // The Mac OS X 10.6 SDK introduced new protocols used for delegates.  These
 // protocol defintions were not present in earlier releases of the Mac OS X
 // SDK.  In order to support building against the new SDK, which requires
@@ -22,7 +26,6 @@
 @end
 
 DEFINE_EMPTY_PROTOCOL(NSAlertDelegate)
-DEFINE_EMPTY_PROTOCOL(NSAnimationDelegate)
 DEFINE_EMPTY_PROTOCOL(NSControlTextEditingDelegate)
 DEFINE_EMPTY_PROTOCOL(NSMatrixDelegate)
 DEFINE_EMPTY_PROTOCOL(NSMenuDelegate)
@@ -30,7 +33,6 @@ DEFINE_EMPTY_PROTOCOL(NSOpenSavePanelDelegate)
 DEFINE_EMPTY_PROTOCOL(NSOutlineViewDelegate)
 DEFINE_EMPTY_PROTOCOL(NSTableViewDataSource)
 DEFINE_EMPTY_PROTOCOL(NSTableViewDelegate)
-DEFINE_EMPTY_PROTOCOL(NSTabViewDelegate)
 DEFINE_EMPTY_PROTOCOL(NSTextFieldDelegate)
 DEFINE_EMPTY_PROTOCOL(NSTextViewDelegate)
 DEFINE_EMPTY_PROTOCOL(NSWindowDelegate)