Commiting http://codereview.chromium.org/2017007/show on behalf of rkc@chromi...

base/mac_util_unittest.mm

 // Copyright (c) 2008-2009 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>
 #include <vector>
 
 #include "base/mac_util.h"
 
 #import "base/chrome_application_mac.h"
@@ skipping 48 matching lines @@
   scoped_nsobject<NSWindow> window(
       [[NSWindow alloc] initWithContentRect:frame
                                   styleMask:NSBorderlessWindowMask
                                     backing:NSBackingStoreBuffered
                                       defer:NO]);
   [window setBackgroundColor:[NSColor whiteColor]];
   [window makeKeyAndOrderFront:NSApp];
 
   scoped_ptr<std::vector<unsigned char> > png_representation(
       new std::vector<unsigned char>);
-  GrabWindowSnapshot(window, png_representation.get());
+  int width, height;
+  GrabWindowSnapshot(window, png_representation.get(),
+                     &width, &height);
 
   // Copy png back into NSData object so we can make sure we grabbed a png.
   scoped_nsobject<NSData> image_data(
       [[NSData alloc] initWithBytes:&(*png_representation)[0]
                              length:png_representation->size()]);
   NSBitmapImageRep* rep = [NSBitmapImageRep imageRepWithData:image_data.get()];
   EXPECT_TRUE([rep isKindOfClass:[NSBitmapImageRep class]]);
   EXPECT_TRUE(CGImageGetWidth([rep CGImage]) == 400);
   NSColor* color = [rep colorAtX:200 y:200];
   CGFloat red = 0, green = 0, blue = 0, alpha = 0;
@@ skipping 79 matching lines @@
                       GetValueFromDictionary(
                           dict, CFSTR("key"), CFStringGetTypeID())));
   EXPECT_FALSE(GetValueFromDictionary(dict, CFSTR("key"), CFNumberGetTypeID()));
   EXPECT_FALSE(GetValueFromDictionary(
                    dict, CFSTR("no-exist"), CFStringGetTypeID()));
 }
 
 }  // namespace
 
 }  // namespace mac_util