| Index: components/translate/ios/browser/language_detection_controller_unittest.mm
|
| diff --git a/components/translate/ios/browser/language_detection_controller_unittest.mm b/components/translate/ios/browser/language_detection_controller_unittest.mm
|
| index d40361b309be31d0d0a4c14c507f2e777c4ebba9..c22a8d921492e1122b069f43a486e2d62849fd79 100644
|
| --- a/components/translate/ios/browser/language_detection_controller_unittest.mm
|
| +++ b/components/translate/ios/browser/language_detection_controller_unittest.mm
|
| @@ -5,6 +5,7 @@
|
| #import "components/translate/ios/browser/language_detection_controller.h"
|
|
|
| #include "base/mac/bind_objc_block.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "components/prefs/pref_registry_simple.h"
|
| #include "components/prefs/testing_pref_service.h"
|
| @@ -14,6 +15,10 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "testing/platform_test.h"
|
|
|
| +#if !defined(__has_feature) || !__has_feature(objc_arc)
|
| +#error "This file requires ARC support."
|
| +#endif
|
| +
|
| @interface MockJsLanguageDetectionManager : JsLanguageDetectionManager
|
| @end
|
|
|
| @@ -33,10 +38,10 @@ class LanguageDetectionControllerTest : public PlatformTest {
|
| LanguageDetectionControllerTest() {
|
| prefs_.registry()->RegisterBooleanPref(prefs::kEnableTranslate, true);
|
|
|
| - base::scoped_nsobject<MockJsLanguageDetectionManager> js_manager(
|
| - [[MockJsLanguageDetectionManager alloc] init]);
|
| - controller_.reset(new LanguageDetectionController(
|
| - &web_state_, js_manager.get(), &prefs_));
|
| + MockJsLanguageDetectionManager* js_manager =
|
| + [[MockJsLanguageDetectionManager alloc] init];
|
| + controller_ = base::MakeUnique<LanguageDetectionController>(
|
| + &web_state_, js_manager, &prefs_);
|
| }
|
|
|
| LanguageDetectionController* controller() { return controller_.get(); }
|
| @@ -57,7 +62,7 @@ TEST_F(LanguageDetectionControllerTest, OnTextCaptured) {
|
|
|
| __block bool block_was_called = false;
|
| auto subscription =
|
| - controller()->RegisterLanguageDetectionCallback(base::BindBlock(
|
| + controller()->RegisterLanguageDetectionCallback(base::BindBlockArc(
|
| ^(const LanguageDetectionController::DetectionDetails& details) {
|
| block_was_called = true;
|
| EXPECT_EQ(kRootLanguage, details.html_root_language);
|
|
|