Fix unittest; we changed the name of the PDF file that the test was using. (Plus a quick part of the original patch missed on checkin.)

BUG=none
TEST=none

TBR

Review URL: http://codereview.chromium.org/149587

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

2 files changed, 6 insertions, 5 deletions

diff --git a/chrome/browser/cocoa/nsimage_cache_unittest.mm b/chrome/browser/cocoa/nsimage_cache_unittest.mm
index 149fb60..b151218 100644
--- a/chrome/browser/cocoa/nsimage_cache_unittest.mm
+++ b/chrome/browser/cocoa/nsimage_cache_unittest.mm
@@ -28,13 +28,13 @@ class NSImageCacheTest : public testing::Test {
 };
 
 TEST_F(NSImageCacheTest, LookupFound) {
-  EXPECT_TRUE(nsimage_cache::ImageNamed(@"back.pdf") != nil)
+  EXPECT_TRUE(nsimage_cache::ImageNamed(@"back_Template.pdf") != nil)
       << "Failed to find the toolbar image?";
 }
 
 TEST_F(NSImageCacheTest, LookupCached) {
-  EXPECT_EQ(nsimage_cache::ImageNamed(@"back.pdf"),
-            nsimage_cache::ImageNamed(@"back.pdf"))
+  EXPECT_EQ(nsimage_cache::ImageNamed(@"back_Template.pdf"),
+            nsimage_cache::ImageNamed(@"back_Template.pdf"))
     << "Didn't get the same NSImage back?";
 }
 
@@ -44,11 +44,11 @@ TEST_F(NSImageCacheTest, LookupMiss) {
 }
 
 TEST_F(NSImageCacheTest, LookupFoundAndClear) {
-  NSImage *first = nsimage_cache::ImageNamed(@"back.pdf");
+  NSImage *first = nsimage_cache::ImageNamed(@"back_Template.pdf");
   EXPECT_TRUE(first != nil)
       << "Failed to find the toolbar image?";
   nsimage_cache::Clear();
-  EXPECT_NE(first, nsimage_cache::ImageNamed(@"back.pdf"))
+  EXPECT_NE(first, nsimage_cache::ImageNamed(@"back_Template.pdf"))
       << "how'd we get the same image after a cache clear?";
 }
 
diff --git a/chrome/browser/cocoa/tab_window_controller.mm b/chrome/browser/cocoa/tab_window_controller.mm
index 41d0b78..14b6b7b 100644
--- a/chrome/browser/cocoa/tab_window_controller.mm
+++ b/chrome/browser/cocoa/tab_window_controller.mm
@@ -82,6 +82,7 @@
     [overlayWindow_ setTitle:@"overlay"];
     [overlayWindow_ setBackgroundColor:[NSColor clearColor]];
     [overlayWindow_ setOpaque:NO];
+    [overlayWindow_ setDelegate:self];
     NSView *contentView = [overlayWindow_ contentView];
     [contentView addSubview:[self tabStripView]];
     cachedContentView_ = [[self window] contentView];