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

Unified Diff: ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm

Issue 2709513004: [ObjC ARC] Converts ios/chrome/app/safe_mode:unit_tests to ARC. (Closed)
Patch Set: include Created 3 years, 10 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
« no previous file with comments | « ios/chrome/app/safe_mode/safe_mode_coordinator_unittest.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm
diff --git a/ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm b/ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm
index 1c0832923cc7376498d4851f6938740b62e52296..0ceb1bebb8b82e09d9627f0253f23ed7958b41ef 100644
--- a/ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm
+++ b/ios/chrome/app/safe_mode/safe_mode_view_controller_unittest.mm
@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "base/mac/scoped_nsobject.h"
#import "breakpad/src/client/ios/BreakpadController.h"
#import "ios/chrome/app/safe_mode/safe_mode_view_controller.h"
#import "ios/chrome/browser/crash_report/breakpad_helper.h"
@@ -13,6 +12,10 @@
#import "third_party/ocmock/OCMock/OCMock.h"
#include "third_party/ocmock/gtest_support.h"
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
namespace {
const int kCrashReportCount = 2;
@@ -22,13 +25,13 @@ class SafeModeViewControllerTest : public PlatformTest {
void SetUp() override {
PlatformTest::SetUp();
- mock_breakpad_controller_.reset(
- [[OCMockObject mockForClass:[BreakpadController class]] retain]);
+ mock_breakpad_controller_ =
+ [OCMockObject mockForClass:[BreakpadController class]];
// Swizzle +[BreakpadController sharedInstance] to return
// |mock_breakpad_controller_| instead of the normal singleton instance.
id implementation_block = ^BreakpadController*(id self) {
- return mock_breakpad_controller_.get();
+ return mock_breakpad_controller_;
};
breakpad_controller_shared_instance_swizzler_.reset(new ScopedBlockSwizzler(
[BreakpadController class], @selector(sharedInstance),
@@ -43,7 +46,7 @@ class SafeModeViewControllerTest : public PlatformTest {
}
protected:
- base::scoped_nsobject<id> mock_breakpad_controller_;
+ id mock_breakpad_controller_;
std::unique_ptr<ScopedBlockSwizzler>
breakpad_controller_shared_instance_swizzler_;
};
@@ -54,40 +57,40 @@ class SafeModeViewControllerTest : public PlatformTest {
TEST_F(SafeModeViewControllerTest, HasSuggestions) {
// Test when crash reporter is disabled.
breakpad_helper::SetEnabled(false);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
breakpad_helper::SetUploadingEnabled(false);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
breakpad_helper::SetUploadingEnabled(true);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
// Test when crash reporter is enabled.
[[mock_breakpad_controller_ expect] start:NO];
breakpad_helper::SetEnabled(true);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
[[mock_breakpad_controller_ expect] setUploadingEnabled:NO];
breakpad_helper::SetUploadingEnabled(false);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
// Test when crash reporter and crash report uploading are enabled.
[[mock_breakpad_controller_ expect] setUploadingEnabled:YES];
breakpad_helper::SetUploadingEnabled(true);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
[mock_breakpad_controller_ cr_expectGetCrashReportCount:0];
EXPECT_FALSE([SafeModeViewController hasSuggestions]);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
[mock_breakpad_controller_ cr_expectGetCrashReportCount:kCrashReportCount];
EXPECT_TRUE([SafeModeViewController hasSuggestions]);
- EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_.get());
+ EXPECT_OCMOCK_VERIFY(mock_breakpad_controller_);
}
} // namespace
« no previous file with comments | « ios/chrome/app/safe_mode/safe_mode_coordinator_unittest.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698