[ObjC ARC] Converts components/signin/ios/browser:browser to ARC.

components/signin/ios/browser/account_consistency_service.mm

 // Copyright 2015 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.
 
 #include "components/signin/ios/browser/account_consistency_service.h"
 
 #import <WebKit/WebKit.h>
 
-#import "base/ios/weak_nsobject.h"
 #include "base/logging.h"
 #import "base/mac/foundation_util.h"
 #include "base/macros.h"
 #include "base/strings/sys_string_conversions.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "components/prefs/scoped_user_pref_update.h"
 #include "components/signin/core/browser/account_reconcilor.h"
 #include "components/signin/core/browser/signin_client.h"
 #include "components/signin/core/browser/signin_header_helper.h"
 #include "ios/web/public/browser_state.h"
 #include "ios/web/public/web_state/web_state_policy_decider.h"
 #include "ios/web/public/web_view_creation_util.h"
 #include "net/base/mac/url_conversions.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
 
+#if !defined(__has_feature) || !__has_feature(objc_arc)
+#error "This file requires ARC support."
+#endif
+
 namespace {
 
 // Threshold (in hours) used to control whether the CHROME_CONNECTED cookie
 // should be added again on a domain it was previously set.
 const int kHoursThresholdToReAddCookie = 24;
 
 // JavaScript template used to set (or delete) the CHROME_CONNECTED cookie.
 // It takes 3 arguments: the domain of the cookie, its value and its expiration
 // date. It also clears the legacy X-CHROME-CONNECTED cookie.
 NSString* const kChromeConnectedCookieTemplate =
@@ skipping 14 matching lines @@
                             AccountReconcilor* account_reconcilor,
                             id<ManageAccountsDelegate> delegate);
 
  private:
   // web::WebStatePolicyDecider override
   bool ShouldAllowResponse(NSURLResponse* response) override;
   void WebStateDestroyed() override;
 
   AccountConsistencyService* account_consistency_service_;  // Weak.
   AccountReconcilor* account_reconcilor_;                   // Weak.
-  base::WeakNSProtocol<id<ManageAccountsDelegate>> delegate_;
+  __weak id<ManageAccountsDelegate> delegate_;
 };
 }
 
 AccountConsistencyHandler::AccountConsistencyHandler(
     web::WebState* web_state,
     AccountConsistencyService* service,
     AccountReconcilor* account_reconcilor,
     id<ManageAccountsDelegate> delegate)
     : web::WebStatePolicyDecider(web_state),
       account_consistency_service_(service),
@@ skipping 311 matching lines @@
   ApplyCookieRequests();
 }
 
 WKWebView* AccountConsistencyService::GetWKWebView() {
   if (!web::BrowserState::GetActiveStateManager(browser_state_)->IsActive()) {
     // |browser_state_| is not active, WKWebView linked to this browser state
     // should not exist or be created.
     return nil;
   }
   if (!web_view_) {
-    web_view_.reset([BuildWKWebView() retain]);
-    navigation_delegate_.reset([[AccountConsistencyNavigationDelegate alloc]
+    web_view_.reset(BuildWKWebView());

[msarda, 2017/06/13 13:15:30]

I think this will assign an object that is autoreleased to a scoped_nsobject.

This code is very tricky - may I ask you to do the following test:
* Fresh install Chrome.
* Start Chrome and from settings sign in to Chrome with any Google account.
* Go to mail.google.com and observe if you are signed in to gmail.

[marq (ping after 24h), 2017/06/15 09:27:33]

It should have (had I kept it a scoped object), under ARC, seen that the scoped
object keeps a strong reference. But it's just a simple assignment now.
 
That work fine, thanks for the test steps!

+    navigation_delegate_ = [[AccountConsistencyNavigationDelegate alloc]
         initWithCallback:base::Bind(&AccountConsistencyService::
                                         FinishedApplyingCookieRequest,
-                                    base::Unretained(this), true)]);
+                                    base::Unretained(this), true)];
     [web_view_ setNavigationDelegate:navigation_delegate_];
   }
   return web_view_.get();
 }
 
 WKWebView* AccountConsistencyService::BuildWKWebView() {
   return web::BuildWKWebView(CGRectZero, browser_state_);
 }
 
 void AccountConsistencyService::ResetWKWebView() {
   [web_view_ setNavigationDelegate:nil];
   [web_view_ stopLoading];
   web_view_.reset();
-  navigation_delegate_.reset();
+  navigation_delegate_ = nil;
   applying_cookie_requests_ = false;
 }
 
 void AccountConsistencyService::AddChromeConnectedCookies() {
   DCHECK(!browser_state_->IsOffTheRecord());
   // These cookie request are preventive and not a strong signal (unlike
   // navigation to a domain). Don't force update the old cookies in this case.
   AddChromeConnectedCookieToDomain("google.com",
                                    false /* force_update_if_too_old */);
   AddChromeConnectedCookieToDomain("youtube.com",
@@ skipping 51 matching lines @@
   // |browser_state_| is now active. There might be some pending cookie requests
   // to apply.
   ApplyCookieRequests();
 }
 
 void AccountConsistencyService::OnInactive() {
   // |browser_state_| is now inactive. Stop using |web_view_| and don't create
   // a new one until it is active.
   ResetWKWebView();
 }