Skip to content

Commit

Permalink
[ObjC ARC] Converts ios/web:ios_web_general_unittests to ARC.
Browse files Browse the repository at this point in the history
Automatically generated ARCMigrate commit
Notable issues:None
BUG=624363
TEST=None

Review-Url: https://codereview.chromium.org/2934083002
Cr-Commit-Position: refs/heads/master@{#479334}
  • Loading branch information
marq authored and Commit Bot committed Jun 14, 2017
1 parent f34801c commit 96aaa6f
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 4 deletions.
1 change: 1 addition & 0 deletions ios/web/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ test("ios_web_unittests") {
}

source_set("ios_web_general_unittests") {
configs += [ "//build/config/compiler:enable_arc" ]
testonly = true
deps = [
":core",
Expand Down
4 changes: 4 additions & 0 deletions ios/web/active_state_manager_impl_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,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

namespace web {
namespace {

Expand Down
4 changes: 4 additions & 0 deletions ios/web/history_state_util_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
#import "testing/gtest_mac.h"
#include "url/gurl.h"

#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif

namespace web {
namespace {
struct TestEntry {
Expand Down
12 changes: 8 additions & 4 deletions ios/web/test/web_test_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#import "ios/web/test/wk_web_view_crash_utils.h"
#include "testing/gtest/include/gtest/gtest-spi.h"

#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif

namespace {

// Fixture to test that the WebTest fixture properly fails tests when the render
Expand All @@ -17,15 +21,15 @@
protected:
void SetUp() override {
web::WebTestWithWebController::SetUp();
web_view_.reset([web::BuildTerminatedWKWebView() retain]);
base::scoped_nsobject<TestWebViewContentView> web_view_content_view(
web_view_ = web::BuildTerminatedWKWebView();
TestWebViewContentView* web_view_content_view =
[[TestWebViewContentView alloc]
initWithMockWebView:web_view_
scrollView:[web_view_ scrollView]]);
scrollView:[web_view_ scrollView]];
[web_controller() injectWebViewContentView:web_view_content_view];
}

base::scoped_nsobject<WKWebView> web_view_;
WKWebView* web_view_;
};

// Tests that the WebTest fixture triggers a test failure when a render process
Expand Down
4 changes: 4 additions & 0 deletions ios/web/url_scheme_util_unittest.mm
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
#import "testing/gtest_mac.h"
#include "url/gurl.h"

#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
#endif

namespace web {

TEST(URLSchemeUtilTest, UrlHasWebScheme) {
Expand Down

0 comments on commit 96aaa6f

Please sign in to comment.