Migrate mac installer to delegate-driven model

chrome/installer/mac/app/OmahaCommunication.m

 // Copyright 2016 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.
 
-#import <Foundation/Foundation.h>
+#import "OmahaCommunication.h"
 
-#include "OmahaCommunication.h"
+#import "OmahaXMLRequest.h"
 
-@implementation OmahaCommunication : NSObject
+@implementation OmahaCommunication
 
 @synthesize requestXMLBody = requestXMLBody_;
 @synthesize sessionHelper = sessionHelper_;
+@synthesize delegate = delegate_;
 
 - (id)init {
-  return [self initWithBody:[[NSXMLDocument alloc] init]];
+  return [self initWithBody:[OmahaXMLRequest createXMLRequestBody]];
 }
 
 - (id)initWithBody:(NSXMLDocument*)xmlBody {
   if ((self = [super init])) {
-    sessionHelper_ = [[NetworkCommunication alloc] init];
+    sessionHelper_ = [[NetworkCommunication alloc] initWithDelegate:self];
     requestXMLBody_ = xmlBody;
     [self createOmahaRequest];
   }
   return self;
 }
 
 - (NSURLRequest*)createOmahaRequest {
   // TODO: turn this string to a comand-line flag
   NSMutableURLRequest* request = [sessionHelper_
       createRequestWithUrlAsString:@"https://tools.google.com/service/update2"
                         andXMLBody:requestXMLBody_];
   request.HTTPMethod = @"POST";
   return request;
 }
 
-- (void)sendRequestWithBlock:(OmahaRequestCompletionHandler)block {
-  DataTaskCompletionHandler cHandler =
-      ^(NSData* _Nullable data, NSURLResponse* _Nullable response,
-        NSError* _Nullable error) {
-        if (error) {
-          NSLog(@"%@", error);
-          block(data, error);
-          return;
-        }
+- (void)sendRequest {
+  [sessionHelper_ sendDataRequest];
+}
 
-        NSHTTPURLResponse* HTTPResponse = (NSHTTPURLResponse*)response;
-        if (HTTPResponse.statusCode != 200) {
-          // TODO: make these logging statements more rare
-          NSLog(@"HTTP response: %ld", (unsigned long)HTTPResponse.statusCode);
-        }
+- (void)URLSession:(NSURLSession*)session
+          dataTask:(NSURLSessionDataTask*)dataTask
+    didReceiveData:(NSData*)data {
+  if (!_dataCollected) {
+    _dataCollected = [[NSMutableData alloc] initWithData:data];
+  } else {
+    [_dataCollected appendData:data];

[Sidney San Martín, 2016/07/22 02:30:17]

You might be better off just using -[NSURLSession
dataTaskWithURL:completionHandler:] — it calls back with a complete NSData,
instead of giving you the pieces as they come in. This class could still take a
delegate, it's just an internal change.

+  }
+}
 
-        block(data, error);
-
-      };
-
-  [sessionHelper_ sendDataRequestWithCompletionHandler:cHandler];
+- (void)URLSession:(NSURLSession*)session
+                    task:(NSURLSessionTask*)task
+    didCompleteWithError:(NSError*)error {
+  [delegate_ onOmahaSuccessWithData:_dataCollected];

[Sidney San Martín, 2016/07/22 02:30:17]

The delegate should get the error, if there is one. For now, you could just
handle errors in MainDelegate with an NSLog(…); exit(1);.

 }
 
 @end