Remove legacy constrained window dialogs

chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller_browsertest.mm

 // Copyright (c) 2012 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.
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_choose_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_extension_prompt_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_inline_service_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_message_view_controller.h"
-#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa2.h"
+#import "chrome/browser/ui/cocoa/intents/web_intent_picker_cocoa.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_picker_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_progress_view_controller.h"
 #import "chrome/browser/ui/cocoa/intents/web_intent_service_row_view_controller.h"
 #import "chrome/browser/ui/cocoa/key_equivalent_constants.h"
 #import "chrome/browser/ui/cocoa/spinner_progress_indicator.h"
 #include "chrome/browser/ui/intents/web_intent_picker_delegate_mock.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "ipc/ipc_message.h"
 #import "testing/gtest_mac.h"
 
 namespace {
 
 NSString* const kTitle = @"A quick brown fox jumps over the lazy dog.";
 
 }  // namespace
 
 class WebIntentPickerViewControllerTest : public InProcessBrowserTest {
  public:
   WebIntentPickerViewControllerTest() : picker_(NULL) {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     content::WebContents* tab =
         browser()->tab_strip_model()->GetWebContentsAt(0);
-    picker_ = new WebIntentPickerCocoa2(tab, &delegate_, &model_);
+    picker_ = new WebIntentPickerCocoa(tab, &delegate_, &model_);
     controller_ = picker_->view_controller();
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
     EXPECT_CALL(delegate_, OnClosing());
     picker_->Close();
   }
 
  protected:
   WebIntentPickerDelegateMock delegate_;
   WebIntentPickerModel model_;
-  WebIntentPickerCocoa2* picker_;  // weak
+  WebIntentPickerCocoa* picker_;  // weak
   WebIntentPickerViewController* controller_;  // weak
 };
 
 // Test that the view is created and embedded in the constrained window.
 IN_PROC_BROWSER_TEST_F(WebIntentPickerViewControllerTest, View) {
   EXPECT_TRUE([controller_ view]);
   EXPECT_TRUE([[controller_ view] superview]);
   EXPECT_NSEQ(picker_->constrained_window()->GetNativeWindow(),
               [[controller_ view] window]);
 }
@@ skipping 164 matching lines @@
   WebIntentExtensionPromptViewController* extension_prompt_controller =
       [controller_ extensionPromptViewController];
   EXPECT_NSEQ([controller_ view],
               [[extension_prompt_controller view] superview]);
 
   // Press cancel.
   [[[extension_prompt_controller viewController] cancelButton]
       performClick:nil];
   EXPECT_EQ(1, delegate.abort_count());
 }