[Background Fetch] Cleanup/fix thread safety

content/browser/background_fetch/background_fetch_service_unittest.cc

 // Copyright 2017 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 <map>
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 103 matching lines @@
                                  base::Unretained(this), run_loop.QuitClosure(),
                                  out_error, out_tags));
 
     run_loop.Run();
   }
 
   // BackgroundFetchTestBase overrides:
   void SetUp() override {
     BackgroundFetchTestBase::SetUp();
 
+    // StoragePartition creates its own BackgroundFetchContext, but this test
+    // doesn't use that since it has the wrong ServiceWorkerContextWrapper; this
+    // test just uses the StoragePartition to get a URLRequestContext.
     StoragePartitionImpl* storage_partition =
         static_cast<StoragePartitionImpl*>(
             BrowserContext::GetDefaultStoragePartition(browser_context()));
-
     context_ = new BackgroundFetchContext(
-        browser_context(), storage_partition,
+        browser_context(),
         make_scoped_refptr(embedded_worker_test_helper()->context_wrapper()));
     context_->InitializeOnIOThread(
         make_scoped_refptr(storage_partition->GetURLRequestContext()));
 
     service_ = base::MakeUnique<BackgroundFetchServiceImpl>(
         0 /* render_process_id */, context_);
   }
 
   void TearDown() override {
     BackgroundFetchTestBase::TearDown();
 
     service_.reset();
 
-    context_->Shutdown();
     context_ = nullptr;
 
     // Give pending shutdown operations a chance to finish.
     base::RunLoop().RunUntilIdle();
   }
 
  private:
   void DidGetRegistration(
       base::Closure quit_closure,
       blink::mojom::BackgroundFetchError* out_error,
@@ skipping 550 matching lines @@
     const bool has_alternative_tag =
         tags[0] == kAlternativeTag || tags[1] == kAlternativeTag;
 
     EXPECT_TRUE(has_example_tag);
     EXPECT_TRUE(has_alternative_tag);
   }
 }
 
 }  // namespace
 }  // namespace content