Merge 41419 - Fix mac unit tests...

chrome/browser/cocoa/bookmark_bar_folder_controller.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 "chrome/browser/cocoa/bookmark_bar_folder_controller.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/browser_theme_provider.h"
 #import "chrome/browser/cocoa/bookmark_bar_constants.h"  // namespace bookmarks
@@ skipping 243 matching lines @@
     buttonFrame.size.width = width;
     [button setFrame:buttonFrame];
   }
 
   // Finally, set our window size (make sure it fits on screen).
   width += (2 * bookmarks::kBookmarkVerticalPadding);
   windowFrame.size.width = width;
 
   // Make the window fit on screen, with a distance of at least |padding| from
   // the sides.
-  const CGFloat padding = 8;
-  NSRect screenFrame = [[[self window] screen] frame];
-  if (NSMaxX(windowFrame) + padding > NSMaxX(screenFrame))
-    windowFrame.origin.x -= NSMaxX(windowFrame) + padding - NSMaxX(screenFrame);
-  else if (NSMinX(windowFrame) - padding < NSMinX(screenFrame))
-    windowFrame.origin.x += NSMinX(screenFrame) - NSMinX(windowFrame) + padding;
+  if ([[self window] screen]) {  // nil in unit tests
+    const CGFloat padding = 8;
+    NSRect screen = [[[self window] screen] frame];
+    if (NSMaxX(windowFrame) + padding > NSMaxX(screen))
+      windowFrame.origin.x -= NSMaxX(windowFrame) + padding - NSMaxX(screen);
+    else if (NSMinX(windowFrame) - padding < NSMinX(screen))
+      windowFrame.origin.x += NSMinX(screen) - NSMinX(windowFrame) + padding;
+  }
   
   [[self window] setFrame:windowFrame display:YES];
 
   [[parentController_ parentWindow] addChildWindow:[self window]
                                            ordered:NSWindowAbove];
 }
 
 - (ThemeProvider*)themeProvider {
   return [parentController_ themeProvider];
 }
@@ skipping 369 matching lines @@
                         initWithParentButton:sender
                             parentController:self];
   [folderController_ showWindow:self];
 }
 
 - (NSArray*)buttons {
   return buttons_.get();
 }
 
 @end  // BookmarkBarFolderController