Adjust callers and networking delegates in ios/ to modified APIs

ios/web/web_state/ui/crw_web_controller.mm

Index: ios/web/web_state/ui/crw_web_controller.mm
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index e7fe4f3c9eb05ce6788928bf465f04c870a81dd1..9af4a78419793762ffbd740d4ce683f449d8b8d4 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -1743,13 +1743,14 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
       [NSString stringWithFormat:@"%@%@", replaceWebViewUrlJS, popstateJS];
   GURL blockURL(URL);
   base::WeakNSObject<CRWWebController> weakSelf(self);
-  [self executeJavaScript:combinedJS completionHandler:^(id, NSError*) {
-    if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
-      return;
-    base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
-    strongSelf.get()->_URLOnStartLoading = blockURL;
-    strongSelf.get()->_lastRegisteredRequestURL = blockURL;
-  }];
+  [self executeJavaScript:combinedJS
+        completionHandler:^(id, NSError*) {
+          if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
+            return;
+          base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
+          strongSelf.get()->_URLOnStartLoading = blockURL;
+          strongSelf.get()->_lastRegisteredRequestURL = blockURL;
+        }];

[droger, 2016/09/05 09:21:31]

If this is just a formatting change, I would not include it in this CL. It looks
pretty unrelated.

Feel free to submit this as a separate CL if you want though.

[maksims (do not use this acc), 2016/09/05 10:39:13]

Ok, thanks! I'll revert.

 }
 
 // Load the current URL in a web view, first ensuring the web view is visible.
@@ -3057,15 +3058,16 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   NSString* replaceWebViewJS =
       [self javascriptToReplaceWebViewURL:pushURL stateObjectJSON:stateObject];
   base::WeakNSObject<CRWWebController> weakSelf(self);
-  [self executeJavaScript:replaceWebViewJS completionHandler:^(id, NSError*) {
-    if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
-      return;
-    base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
-    [strongSelf optOutScrollsToTopForSubviews];
-    // Notify the observers.
-    strongSelf.get()->_webStateImpl->OnHistoryStateChanged();
-    [strongSelf didFinishNavigation];
-  }];
+  [self executeJavaScript:replaceWebViewJS
+        completionHandler:^(id, NSError*) {
+          if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
+            return;
+          base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
+          [strongSelf optOutScrollsToTopForSubviews];
+          // Notify the observers.
+          strongSelf.get()->_webStateImpl->OnHistoryStateChanged();
+          [strongSelf didFinishNavigation];
+        }];
   return YES;
 }
 
@@ -3116,12 +3118,13 @@ const NSTimeInterval kSnapshotOverlayTransition = 0.5;
   NSString* replaceStateJS = [self javascriptToReplaceWebViewURL:replaceURL
                                                  stateObjectJSON:stateObject];
   base::WeakNSObject<CRWWebController> weakSelf(self);
-  [self executeJavaScript:replaceStateJS completionHandler:^(id, NSError*) {
-    if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
-      return;
-    base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
-    [strongSelf didFinishNavigation];
-  }];
+  [self executeJavaScript:replaceStateJS
+        completionHandler:^(id, NSError*) {
+          if (!weakSelf || weakSelf.get()->_isBeingDestroyed)
+            return;
+          base::scoped_nsobject<CRWWebController> strongSelf([weakSelf retain]);
+          [strongSelf didFinishNavigation];
+        }];
   return YES;
 }