First cut at popup blocking for Mac. Remove ifdefs in cross-platform code. Im...

chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm

Index: chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm	(revision 0)
+++ chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm	(revision 0)
@@ -0,0 +1,85 @@
+// Copyright (c) 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 "app/app_paths.h"
+#include "base/path_service.h"
+#import "chrome/browser/cocoa/blocked_popup_container_controller.h"
+#include "chrome/browser/cocoa/browser_test_helper.h"
+#import "chrome/browser/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/renderer_host/test_render_view_host.h"
+#include "net/base/net_util.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+
+namespace {
+const std::string host1 = "host1";
+}  // namespace
+
+class BlockedPopupContainerControllerTest : public RenderViewHostTestHarness {
+ public:
+  CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
+
+  virtual void SetUp() {
+    RenderViewHostTestHarness::SetUp();
+    container_ = BlockedPopupContainer::Create(contents(), profile());
+    cocoa_controller_ = [[BlockedPopupContainerController alloc]
+                          initWithContainer:container_];
+    EXPECT_TRUE([cocoa_controller_ bridge]);
+    container_->set_view([cocoa_controller_ bridge]);
+    contents_->set_blocked_popup_container(container_);
+  }
+
+  virtual void TearDown() {
+    // This will also signal the Cocoa controller to delete itself with a
+    // Destroy() mesage to the bridge.
+    container_->Destroy();
+    contents_->set_blocked_popup_container(NULL);
+  }
+
+  TabContents* BuildTabContents() {
+    // This will be deleted when the TabContents goes away.
+    SiteInstance* instance = SiteInstance::CreateSiteInstance(profile_.get());
+
+    // Set up and use TestTabContents here.
+    return new TestTabContents(profile_.get(), instance);
+  }
+
+  GURL GetTestCase(const std::string& file) {
+    FilePath filename;
+    PathService::Get(app::DIR_TEST_DATA, &filename);
+    filename = filename.AppendASCII("constrained_files");
+    filename = filename.AppendASCII(file);
+    return net::FilePathToFileURL(filename);
+  }
+
+  BlockedPopupContainer* container_;
+  BlockedPopupContainerController* cocoa_controller_;
+};
+
+TEST_F(BlockedPopupContainerControllerTest, BasicPopupBlock) {
+  // This is taken from the popup blocker unit test.
+  TabContents* popup = BuildTabContents();
+  popup->controller().LoadURLLazily(GetTestCase("error"), GURL(),
+                                    PageTransition::LINK,
+                                    L"", NULL);
+  container_->AddTabContents(popup, gfx::Rect(), host1);
+  EXPECT_EQ(container_->GetBlockedPopupCount(), static_cast<size_t>(1));
+  EXPECT_EQ(container_->GetTabContentsAt(0), popup);
+  EXPECT_FALSE(container_->IsHostWhitelisted(0));
+
+  // Ensure the view has been displayed. If it has a superview, then ShowView()
+  // has been called on the bridge. If the label has a string, then
+  // UpdateLabel() has been called.
+  EXPECT_TRUE([cocoa_controller_ view]);
+  EXPECT_TRUE([[cocoa_controller_ view] superview]);
+  EXPECT_TRUE([[(NSTextField*)[cocoa_controller_ label]
+                stringValue] length] > 0);
+
+  // Close the popup and verify it's no longer in the view hierarchy. This
+  // means HideView() has been called.
+  [cocoa_controller_ closePopup:nil];
+  EXPECT_FALSE([[cocoa_controller_ view] superview]);
+}
Property changes on: chrome/browser/cocoa/blocked_popup_container_controller_unittest.mm
___________________________________________________________________
Name: svn:eol-style
   + LF