libchrome: Fix the build in OS X > 10.10
For some reason, there is a conflict in the forward declaration of
NSUserActivity. This allows newer versions of OS X than what the
buildbots have to be able to build libchrome.
Bug: 28985443
Change-Id: I3ba3af04fcaba086862f3114250324348c0c9cf2
Test: mmma -j external/libchrome # in El Capitan
diff --git a/base/mac/sdk_forward_declarations.h b/base/mac/sdk_forward_declarations.h
index 972a0cc..818a1d0 100644
--- a/base/mac/sdk_forward_declarations.h
+++ b/base/mac/sdk_forward_declarations.h
@@ -77,18 +77,6 @@
#endif // MAC_OS_X_VERSION_10_9
-#if !defined(MAC_OS_X_VERSION_10_10) || \
- MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_10
-
-@interface NSUserActivity : NSObject
-@end
-
-#else
-
-@class NSUserActivity;
-
-#endif // MAC_OS_X_VERSION_10_10
-
// ----------------------------------------------------------------------------
// Define typedefs, enums, and protocols not available in the version of the
// OSX SDK being compiled against.
@@ -502,18 +490,6 @@
#if !defined(MAC_OS_X_VERSION_10_10) || \
MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10
-@interface NSUserActivity (YosemiteSDK)
-
-@property(readonly, copy) NSString* activityType;
-@property(copy) NSDictionary* userInfo;
-@property(copy) NSURL* webpageURL;
-
-- (instancetype)initWithActivityType:(NSString*)activityType;
-- (void)becomeCurrent;
-- (void)invalidate;
-
-@end
-
@interface CBUUID (YosemiteSDK)
- (NSString*)UUIDString;
@end
