Fix the error found by -Wextra, disable part of the test because it doesn't s...

chrome/browser/cocoa/translate_infobar.mm

 // Copyright (c) 2010 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.
 
 #import <Cocoa/Cocoa.h>
 #import "chrome/browser/cocoa/translate_infobar.h"
 
 #include "app/l10n_util.h"
 #include "base/logging.h"  // for NOTREACHED()
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/app/chrome_dll_resource.h"
 #import "chrome/browser/cocoa/hover_close_button.h"
 #include "chrome/browser/cocoa/infobar.h"
 #import "chrome/browser/cocoa/infobar_controller.h"
 #import "chrome/browser/cocoa/infobar_gradient_view.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/common/notification_service.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "third_party/GTM/AppKit/GTMUILocalizerAndLayoutTweaker.h"
 
+// http://crbug.com/46663 disabled since it never worked.
+#define DISABLE_VERIFY_CONTROL_ORDER 1
+
 // Colors for translate infobar gradient background.
 const int kGreyTopColor[] = {0xC0, 0xC0, 0xC0};
 const int kGreyBottomColor[] = {0xCC, 0xCC, 0xCC};
 
 #pragma mark Anonymous helper functions.
 namespace {
 
 // Move the |toMove| view |spacing| pixels before/after the |anchor| view.
 // |after| signifies the side of |anchor| on which to place |toMove|.
 void MoveControl(NSView* anchor, NSView* toMove, int spacing, bool after) {
@@ skipping 20 matching lines @@
   NSRect viewFrame = [toMove frame];
 
   viewFrame.origin.y =
       floor((NSHeight(superViewFrame) - NSHeight(viewFrame))/2.0);
   [toMove setFrame:viewFrame];
 }
 
 // Check that the control |before| is ordered visually before the |after|
 // control.
 // Also, check that there is space between them.
+// http://crbug.com/46663 the code below seems to be the reverse of this
+// comment.
+#if !defined(DISABLE_VERIFY_CONTROL_ORDER)
 bool VerifyControlOrderAndSpacing(id before, id after) {
-  NSRect beforeFrame = [before frame];
-  NSRect afterFrame = [after frame];
-  NSUInteger spaceBetweenControls = -1;
-
+  CGFloat spaceBetweenControls = 0;
+  if (before && after) {
+    // When messaging nil, the rects won't always be zeroed (only sizeof(id) is
+    // going to be zeroed by the Objective-C runtime, rest will be uninitialized
+    // memory).
+    NSRect beforeFrame = [before frame];
+    NSRect afterFrame = [after frame];
     spaceBetweenControls = NSMaxX(beforeFrame) - NSMinX(afterFrame);
     // RTL case to be used when we have an RTL version of this UI.
     // spaceBetweenControls = NSMaxX(afterFrame) - NSMinX(beforeFrame);
 
+  }
+
   return (spaceBetweenControls >= 0);
 }
+#endif  // !defined(DISABLE_VERIFY_CONTROL_ORDER)
 
 // Creates a label control in the style we need for the translate infobar's
 // labels within |bounds|.
 NSTextField* CreateLabel(NSRect bounds) {
   NSTextField* ret = [[NSTextField alloc] initWithFrame:bounds];
   [ret setEditable:NO];
   [ret setDrawsBackground:NO];
   [ret setBordered:NO];
   return ret;
 }
@@ skipping 679 matching lines @@
       LOG(ERROR) <<
           "State: " << state << " translationPending " << translationPending <<
           " Control @" << i << (hasSuperView ? " has" : " doesn't have") <<
           " a superview" << [[control description] UTF8String] <<
           " Title=" << [title UTF8String];
       return false;
     }
   }
 
   // Step 2: Check that controls are ordered correctly with no overlap.
+#if !defined(DISABLE_VERIFY_CONTROL_ORDER)
+  // http://crbug.com/46663 this appears to be invalid.
+  // VerifyControlOrderAndSpacing had an unsigned >= 0 bug, so it used to always
+  // return true.  With that bug fixed, this loop now can return a failure.
+  // Scanning the code, it's not clear how this would pass since not all
+  // controls are visible and it needs the array order to always match display
+  // order.
   id previousControl = nil;
   for (NSUInteger i = 0; i < [allControls count]; ++i) {
     id control = [allControls objectAtIndex:i];
     if (!VerifyControlOrderAndSpacing(previousControl, control)) {
       LOG(ERROR) <<
           "State: " << state << " translationPending " << translationPending <<
           " Control @" << i << " not ordered correctly: " <<
           [[control description] UTF8String];
       return false;
     }
     previousControl = control;
   }
+#endif  // !defined(DISABLE_VERIFY_CONTROL_ORDER)
 
   // Step 3: Check other misc. attributes of layout.
   if (state == TranslateInfoBarDelegate::kTranslateError && translationPending)
   {
     if ([[label1_ stringValue] length] != 0) {
       LOG(ERROR) << "Expected empty label1_, instead got" <<
           [[label1_ description] UTF8String];
       return false;
     }
   }
@@ skipping 116 matching lines @@
   PageTranslatedDetails* page_translated_details =
       Details<PageTranslatedDetails>(details).ptr();
   TranslateErrors::Type error = page_translated_details->error_type;
   TranslateInfoBarDelegate::TranslateState newState =
       TranslateInfoBarDelegate::kAfterTranslate;
   if (page_translated_details->error_type != TranslateErrors::NONE)
       newState = TranslateInfoBarDelegate::kTranslateError;
   [controller_ updateState:newState translationPending:false error:error];
 
 }