Move TranslateInfoBarDelegate and OptionsMenuModel to the Translate component.

chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm

 // Copyright (c) 2011 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>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#import "chrome/app/chrome_command_ids.h"  // For translate menu command ids.
 #include "chrome/browser/infobars/infobar_service.h"
-#import "chrome/browser/translate/translate_infobar_delegate.h"
 #import "chrome/browser/translate/translate_tab_helper.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/infobars/before_translate_infobar_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/translate_infobar_base.h"
 #include "chrome/test/base/testing_profile.h"
+#import "components/translate/core/browser/options_menu_model.h"
+#import "components/translate/core/browser/translate_infobar_delegate.h"
 #include "components/translate/core/browser/translate_language_list.h"
 #include "components/translate/core/browser/translate_manager.h"
 #import "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #import "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest/include/gtest/gtest.h"
 #import "testing/platform_test.h"
 
 using content::WebContents;
 
@@ skipping 60 matching lines @@
     }
     CocoaProfileTest::TearDown();
   }
 
   void CreateInfoBar(translate::TranslateStep type) {
     TranslateErrors::Type error = TranslateErrors::NONE;
     if (type == translate::TRANSLATE_STEP_TRANSLATE_ERROR)
       error = TranslateErrors::NETWORK;
     [[infobar_controller_ view] removeFromSuperview];
 
+    TranslateTabHelper* translate_tab_helper =
+        TranslateTabHelper::FromWebContents(web_contents_.get());
     scoped_ptr<TranslateInfoBarDelegate> delegate(
         new MockTranslateInfoBarDelegate(web_contents_.get(), type, error));
     scoped_ptr<infobars::InfoBar> infobar(
-        TranslateInfoBarDelegate::CreateInfoBar(delegate.Pass()));
+        translate_tab_helper->CreateInfoBar(delegate.Pass()));
     if (infobar_)
       infobar_->CloseSoon();
     infobar_ = static_cast<InfoBarCocoa*>(infobar.release());
     infobar_->SetOwner(InfoBarService::FromWebContents(web_contents_.get()));
 
     infobar_controller_.reset([static_cast<TranslateInfoBarControllerBase*>(
         infobar_->controller()) retain]);
 
     // We need to set the window to be wide so that the options button
     // doesn't overlap the other buttons.
@@ skipping 83 matching lines @@
 
   {
     EXPECT_CALL(*infobar_delegate(), ToggleSiteBlacklist())
     .Times(1);
     [infobar_controller_ optionsMenuChanged:neverTranslateSiteItem];
   }
 
   {
     // Can't mock these effectively, so just check that the tag is set
     // correctly.
-    EXPECT_EQ(IDC_TRANSLATE_REPORT_BAD_LANGUAGE_DETECTION,
+    EXPECT_EQ(OptionsMenuModel::REPORT_BAD_DETECTION,
               [reportBadLanguageItem tag]);
-    EXPECT_EQ(IDC_TRANSLATE_OPTIONS_ABOUT, [aboutTranslateItem tag]);
+    EXPECT_EQ(OptionsMenuModel::ABOUT_TRANSLATE, [aboutTranslateItem tag]);
   }
 }
 
 // Check that selecting a new item from the "Source Language" popup in "before
 // translate" mode doesn't trigger a translation or change state.
 // http://crbug.com/36666
 TEST_F(TranslationInfoBarTest, Bug36666) {
   CreateInfoBar(translate::TRANSLATE_STEP_BEFORE_TRANSLATE);
   EXPECT_CALL(*infobar_delegate(), Translate())
     .Times(0);
@@ skipping 41 matching lines @@
   translate_prefs->ResetTranslationDeniedCount("en");
   for (int i = 0; i < 4; ++i) {
     translate_prefs->IncrementTranslationDeniedCount("en");
   }
   CreateInfoBar(translate::TRANSLATE_STEP_BEFORE_TRANSLATE);
   BeforeTranslateInfobarController* controller =
       (BeforeTranslateInfobarController*)infobar_controller_.get();
   EXPECT_TRUE([[controller alwaysTranslateButton] superview] == nil);
   EXPECT_TRUE([[controller neverTranslateButton] superview] != nil);
 }