Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(522)

Unified Diff: ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm

Issue 2835413003: [ObjC ARC] Converts ios/chrome/browser/ui/toolbar:unit_tests to ARC. (Closed)
Patch Set: Address comments Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm
diff --git a/ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm b/ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm
index 1e7fe9533b8a7fffc9b205323950c4cbf016fdbf..06979e003c2064eed1914d8f5be0b59c346768c7 100644
--- a/ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm
+++ b/ios/chrome/browser/ui/toolbar/toolbar_controller_unittest.mm
@@ -5,13 +5,16 @@
#import <Foundation/Foundation.h>
#include "base/format_macros.h"
-#include "base/mac/scoped_nsobject.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_controller.h"
#import "ios/chrome/browser/ui/toolbar/toolbar_controller_private.h"
#import "ios/chrome/browser/ui/ui_util.h"
#include "testing/gtest_mac.h"
#include "testing/platform_test.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
// A constant holding some number of tabs that will trigger an easter egg.
const NSInteger kStackButtonEasterEggTabCount = kStackButtonMaxTabCount + 1;
@@ -31,11 +34,12 @@ namespace {
class ToolbarControllerTest : public PlatformTest {
protected:
void SetUp() override {
- toolbarController_.reset([[ToolbarController alloc]
- initWithStyle:ToolbarControllerStyleLightMode]);
+ PlatformTest::SetUp();
+ toolbarController_ = [[ToolbarController alloc]
+ initWithStyle:ToolbarControllerStyleLightMode];
}
- base::scoped_nsobject<ToolbarController> toolbarController_;
+ ToolbarController* toolbarController_;
};
// Verify that if tab count is set to zero, the title is blank, but the a11y
« no previous file with comments | « ios/chrome/browser/ui/toolbar/BUILD.gn ('k') | ios/chrome/browser/ui/toolbar/toolbar_model_impl_ios_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698