Remove the now-unnecessary RequestTracker in a unit test.

ios/chrome/app/application_delegate/app_state_unittest.mm

 // 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 "ios/chrome/app/application_delegate/app_state.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "base/ios/block_types.h"
 #include "base/mac/scoped_block.h"
@@ skipping 19 matching lines @@
 #import "ios/chrome/browser/tabs/tab_model.h"
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 #import "ios/chrome/browser/ui/main/browser_view_information.h"
 #import "ios/chrome/browser/ui/settings/settings_navigation_controller.h"
 #import "ios/chrome/test/base/scoped_block_swizzler.h"
 #include "ios/chrome/test/ios_chrome_scoped_testing_chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/distribution/app_distribution_provider.h"
 #include "ios/public/provider/chrome/browser/test_chrome_browser_provider.h"
 #include "ios/public/provider/chrome/browser/user_feedback/test_user_feedback_provider.h"
 #import "ios/testing/ocmock_complex_type_helper.h"
-#include "ios/web/net/request_tracker_impl.h"
 #include "ios/web/public/test/test_web_thread_bundle.h"
 #include "testing/platform_test.h"
 #import "third_party/ocmock/OCMock/OCMock.h"
 #include "third_party/ocmock/gtest_support.h"
 
 #if !defined(__has_feature) || !__has_feature(objc_arc)
 #error "This file requires ARC support."
 #endif
 
 #pragma mark - Class definition.
@@ skipping 230 matching lines @@
   id browser_view_information_;
   DecisionBlock safe_mode_swizzle_block_;
   HandleStartupParam handle_startup_swizzle_block_;
   ProceduralBlock metrics_mediator_swizzle_block_;
   std::unique_ptr<ScopedBlockSwizzler> safe_mode_swizzler_;
   std::unique_ptr<ScopedBlockSwizzler> handle_startup_swizzler_;
   std::unique_ptr<ScopedBlockSwizzler> metrics_mediator_swizzler_;
   __block BOOL metrics_mediator_called_;
 };
 
-// TODO(crbug.com/585700): remove this.
-// Creates a requestTracker, needed for teardown.
-void createTracker(BOOL* created, base::Lock* lock) {
-  web::RequestTrackerImpl::GetTrackerForRequestGroupID(@"test");
-  base::AutoLock scoped_lock(*lock);
-  *created = YES;
-}
-
 // Used to have a thread handling the closing of the IO threads.
 class AppStateWithThreadTest : public PlatformTest {
  protected:
   AppStateWithThreadTest()
-      : thread_bundle_(web::TestWebThreadBundle::REAL_IO_THREAD) {
-    BOOL created = NO;
-    base::Lock* lock = new base::Lock;
-
-    web::WebThread::PostTask(web::WebThread::IO, FROM_HERE,
-                             base::Bind(&createTracker, &created, lock));
-
-    CFTimeInterval start = CACurrentMediaTime();
-
-    // Poll for at most 1s, waiting for the Tracker creation.
-    while (1) {
-      base::AutoLock scoped_lock(*lock);
-      if (created)
-        return;
-      if (CACurrentMediaTime() - start > 1.0) {
-        trackerCreationFailed();
-        return;
-      }
-      // Ensure that other threads have a chance to run even on a single-core
-      // devices.
-      pthread_yield_np();
-    }
-  }
-
-  void trackerCreationFailed() {
-    FAIL() << "Tracker creation took too much time.";
-  }
+      : thread_bundle_(web::TestWebThreadBundle::REAL_IO_THREAD) {}

[sdefresne, 2017/02/21 10:40:30]

Can you try to not pass web::TestWebThreadBundle::REAL_IO_THREAD to this
constructor (i.e. use the default constructor)? I think it may work with default
constructor which would avoid creating a real thread. If not, then we can go
back to this version.

 
  private:
   web::TestWebThreadBundle thread_bundle_;
 };
 
 #pragma mark - Tests.
 
 // Tests -isInSafeMode returns true if there is a SafeModeController.
 TEST_F(AppStateTest, isInSafeModeTest) {
   // Setup.
@@ skipping 586 matching lines @@
   // Action.
   [appState applicationDidEnterBackground:application
                              memoryHelper:memoryHelper
                       tabSwitcherIsActive:YES];
 
   // Tests.
   EXPECT_OCMOCK_VERIFY(startupInformation);
   EXPECT_TRUE(metricsMediatorHasBeenCalled());
   EXPECT_EQ(NSUInteger(0), [window subviews].count);
 }