Remove RequestTracker from WebStateImpl.

ios/web/webui/crw_web_ui_manager.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.
 
 #import "ios/web/webui/crw_web_ui_manager.h"
 
 #include <memory>
 #include <vector>
 
 #include "base/json/string_escape.h"
 #import "base/mac/bind_objc_block.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/strings/stringprintf.h"
 #import "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "ios/web/grit/ios_web_resources.h"
 #import "ios/web/net/request_group_util.h"

[Eugene But (OOO till 7-30), 2017/01/19 19:05:55]

nit: Do we still need this include?

[sdefresne, 2017/01/20 11:31:28]

Removed.

 #include "ios/web/public/browser_state.h"
 #import "ios/web/public/web_client.h"
 #import "ios/web/public/web_state/web_state_observer_bridge.h"
 #import "ios/web/web_state/web_state_impl.h"
 #import "ios/web/webui/crw_web_ui_page_builder.h"
 #include "ios/web/webui/mojo_js_constants.h"
 #import "ios/web/webui/url_fetcher_block_adapter.h"
 #include "mojo/public/js/constants.h"
 #import "net/base/mac/url_conversions.h"
 
@@ skipping 75 matching lines @@
 
 #pragma mark - CRWWebStateObserver Methods
 
 - (void)webState:(web::WebState*)webState
     didStartProvisionalNavigationForURL:(const GURL&)URL {
   DCHECK(webState == _webState);
   // If URL is not an application specific URL, ignore the navigation.
   if (!web::GetWebClient()->IsAppSpecificURL(URL))
     return;
 
-  GURL navigationURL(URL);
-  // Add request group ID to the URL, if not present. Request group ID may
-  // already be added if restoring state to a WebUI page.
-  GURL requestURL =
-      web::ExtractRequestGroupIDFromURL(net::NSURLWithGURL(URL))
-          ? URL
-          : net::GURLWithNSURL(web::AddRequestGroupIDToURL(
-                net::NSURLWithGURL(URL), _webState->GetRequestGroupID()));
+  // Copy |URL| as it is passed by reference which does not work correctly
+  // with blocks (if the object is destroyed the block will have a dangling
+  // reference).
+  GURL copyURL(URL);
   base::WeakNSObject<CRWWebUIManager> weakSelf(self);
-  [self loadWebUIPageForURL:requestURL
+  [self loadWebUIPageForURL:copyURL
           completionHandler:^(NSString* HTML) {
             web::WebStateImpl* webState = [weakSelf webState];
             if (webState) {
-              webState->LoadWebUIHtml(base::SysNSStringToUTF16(HTML),
-                                      navigationURL);
+              webState->LoadWebUIHtml(base::SysNSStringToUTF16(HTML), copyURL);
             }
           }];
 }
 
 - (void)webState:(web::WebState*)webState didLoadPageWithSuccess:(BOOL)success {
   DCHECK_EQ(webState, _webState);
   // All WebUI pages are HTML based.
   _webState->SetContentsMimeType("text/html");
 }
 
@@ skipping 166 matching lines @@
 #pragma mark - Testing-Only Methods
 
 - (std::unique_ptr<web::URLFetcherBlockAdapter>)
     fetcherForURL:(const GURL&)URL
 completionHandler:(web::URLFetcherBlockAdapterCompletion)handler {
   return base::MakeUnique<web::URLFetcherBlockAdapter>(
       URL, _webState->GetBrowserState()->GetRequestContext(), handler);
 }
 
 @end