Revert 49984 - patch from issue 2762014

TBR=thakis@chromium.org
Review URL: http://codereview.chromium.org/2835007

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

5 files changed, 7 insertions, 27 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
index cb4145aa..b565e98 100644
--- a/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
+++ b/chrome/browser/autocomplete/autocomplete_edit_view_mac.mm
@@ -878,8 +878,7 @@ void AutocompleteEditViewMac::FocusLocation(bool select_all) {
     // call it if this behavior is desired.
     if (select_all || ![field_ currentEditor])
       [[field_ window] makeFirstResponder:field_];
-// FIXME
-    DCHECK_EQ((id)[field_ currentEditor], (id)[[field_ window] firstResponder]);
+    DCHECK_EQ([field_ currentEditor], [[field_ window] firstResponder]);
   }
 }
 
diff --git a/chrome/browser/autofill/autofill_text_field_mac.mm b/chrome/browser/autofill/autofill_text_field_mac.mm
index 9860f4a..ff5b1a0 100644
--- a/chrome/browser/autofill/autofill_text_field_mac.mm
+++ b/chrome/browser/autofill/autofill_text_field_mac.mm
@@ -28,12 +28,10 @@
   return becoming;
 }
 
-- (void)setObjectValue:(id<NSCopying>)object {
-// FIXME
-  if (isCreditCardField_ &&
-      [(NSObject*)object isKindOfClass:[NSString class]]) {
+- (void)setObjectValue:(id)object {
+  if (isCreditCardField_ && [object isKindOfClass:[NSString class]]) {
     // Obfuscate the number.
-    NSString* string = (NSString*)object;  // FIXME: NSMutableCopying
+    NSString* string = object;
     CreditCard card;
     card.SetInfo(AutoFillType(CREDIT_CARD_NUMBER),
                  base::SysNSStringToUTF16(string));
diff --git a/chrome/browser/chrome_browser_application_mac.mm b/chrome/browser/chrome_browser_application_mac.mm
index 979fd2b..f696e96 100644
--- a/chrome/browser/chrome_browser_application_mac.mm
+++ b/chrome/browser/chrome_browser_application_mac.mm
@@ -85,11 +85,7 @@ size_t BinForException(NSException* exception) {
   // A list of common known exceptions.  The list position will
   // determine where they live in the histogram, so never move them
   // around, only add to the end.
-<<<<<<< HEAD
   static NSString* const kKnownNSExceptionNames[] = {
-=======
-  static NSString* kKnownNSExceptionNames[] = {
->>>>>>> more
     // ???
     NSGenericException,
 
@@ -280,11 +276,7 @@ BOOL SwizzleNSExceptionInit() {
   // When a Cocoa control is wired to a freed object, we get crashers
   // in the call to |super| with no useful information in the
   // backtrace.  Attempt to add some useful information.
-<<<<<<< HEAD
   static NSString* const kActionKey = @"sendaction";
-=======
-  static NSString* kActionKey = @"sendaction";
->>>>>>> more
 
   // If the action is something generic like -commandDispatch:, then
   // the tag is essential.
@@ -326,15 +318,9 @@ BOOL SwizzleNSExceptionInit() {
     // is tracked because it may be the one which caused the system to
     // go off the rails.  The last exception thrown is tracked because
     // it may be the one most directly associated with the crash.
-<<<<<<< HEAD
     static NSString* const kFirstExceptionKey = @"firstexception";
     static BOOL trackedFirstException = NO;
     static NSString* const kLastExceptionKey = @"lastexception";
-=======
-    static NSString* kFirstExceptionKey = @"firstexception";
-    static BOOL trackedFirstException = NO;
-    static NSString* kLastExceptionKey = @"lastexception";
->>>>>>> more
 
     // TODO(shess): It would be useful to post some stacktrace info
     // from the exception.
diff --git a/chrome/browser/cocoa/authorization_util.mm b/chrome/browser/cocoa/authorization_util.mm
index 6eb0f84..a879db2 100644
--- a/chrome/browser/cocoa/authorization_util.mm
+++ b/chrome/browser/cocoa/authorization_util.mm
@@ -47,8 +47,7 @@ AuthorizationRef AuthorizationCreateToRunAsRoot(CFStringRef prompt) {
 
   // The OS will append " Type an administrator's name and password to allow
   // <CFBundleDisplayName> to make changes."
-//FIXME
-  NSString* prompt_ns = (NSString*)prompt;
+  NSString* prompt_ns = reinterpret_cast<const NSString*>(prompt);
   const char* prompt_c = [prompt_ns UTF8String];
   size_t prompt_length = prompt_c ? strlen(prompt_c) : 0;
 
diff --git a/chrome/browser/renderer_host/render_widget_helper.cc b/chrome/browser/renderer_host/render_widget_helper.cc
index e2cd531..baa8045 100644
--- a/chrome/browser/renderer_host/render_widget_helper.cc
+++ b/chrome/browser/renderer_host/render_widget_helper.cc
@@ -296,8 +296,7 @@ void RenderWidgetHelper::FreeTransportDIB(TransportDIB::Id dib_id) {
     i = allocated_dibs_.find(dib_id);
 
   if (i != allocated_dibs_.end()) {
-    if (HANDLE_EINTR(close(i->second)) < 0)
-      PLOG(ERROR) << "close";
+    HANDLE_EINTR(close(i->second));
     allocated_dibs_.erase(i);
   } else {
     DLOG(WARNING) << "Renderer asked us to free unknown transport DIB";
@@ -307,8 +306,7 @@ void RenderWidgetHelper::FreeTransportDIB(TransportDIB::Id dib_id) {
 void RenderWidgetHelper::ClearAllocatedDIBs() {
   for (std::map<TransportDIB::Id, int>::iterator
        i = allocated_dibs_.begin(); i != allocated_dibs_.end(); ++i) {
-    if (HANDLE_EINTR(close(i->second)) < 0)
-      PLOG(ERROR) << "close: " << i->first;
+    HANDLE_EINTR(close(i->second));
   }
 
   allocated_dibs_.clear();