Add Location annotation ScopedBlockingCall

This CL is adding the FROM_HERE location of the call sites to each
ScopedBlockingCall. This modification will provide the
detailed location to the trace events and allow developpers do
understand cause of janks of long tasks.

This CL is adding manually the cases not caught by the previous CL:
  https://chromium-review.googlesource.com/c/chromium/src/+/1483834


TBR=gab@chromium.org (skipping owners for side-effects after //base review)

Bug: 934302
Change-Id: I04dc84ddc0b8824f91d7409bb06c74397ec7bf32
Reviewed-on: https://chromium-review.googlesource.com/c/1489110Reviewed-by: Gabriel Charette <gab@chromium.org>
Commit-Queue: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/heads/master@{#635701}

base/metrics/persistent_memory_allocator.cc

@@ -29,7 +29,7 @@
 namespace {
 
 // Limit of memory segment size. It has to fit in an unsigned 32-bit number
-// and should be a power of 2 in order to accomodate almost any page size.
+// and should be a power of 2 in order to accommodate almost any page size.
 const uint32_t kSegmentMaxSize = 1 << 30;  // 1 GiB
 
 // A constant (random) value placed in the shared metadata to identify
@@ -1122,11 +1122,11 @@ void FilePersistentMemoryAllocator::FlushPartial(size_t length, bool sync) {
 
   base::Optional<base::ScopedBlockingCall> scoped_blocking_call;
   if (sync)
-    scoped_blocking_call.emplace(base::BlockingType::MAY_BLOCK);
+    scoped_blocking_call.emplace(FROM_HERE, base::BlockingType::MAY_BLOCK);
 
 #if defined(OS_WIN)
   // Windows doesn't support asynchronous flush.
-  scoped_blocking_call.emplace(base::BlockingType::MAY_BLOCK);
+  scoped_blocking_call.emplace(FROM_HERE, base::BlockingType::MAY_BLOCK);
   BOOL success = ::FlushViewOfFile(data(), length);
   DPCHECK(success);
 #elif defined(OS_MACOSX)

base/task/task_scheduler/scheduler_worker_pool_impl_unittest.cc

@@ -983,13 +983,15 @@ struct NestedBlockingType {
 class NestedScopedBlockingCall {
  public:
   NestedScopedBlockingCall(const NestedBlockingType& nested_blocking_type)
-      : first_scoped_blocking_call_(nested_blocking_type.first),
+      : first_scoped_blocking_call_(FROM_HERE, nested_blocking_type.first),
         second_scoped_blocking_call_(
             nested_blocking_type.second == OptionalBlockingType::WILL_BLOCK
-                ? std::make_unique<ScopedBlockingCall>(BlockingType::WILL_BLOCK)
+                ? std::make_unique<ScopedBlockingCall>(FROM_HERE,
+                                                       BlockingType::WILL_BLOCK)
                 : (nested_blocking_type.second ==
                            OptionalBlockingType::MAY_BLOCK
                        ? std::make_unique<ScopedBlockingCall>(
+                             FROM_HERE,
                              BlockingType::MAY_BLOCK)
                        : nullptr)) {}
 
@@ -1479,7 +1481,7 @@ TEST_F(TaskSchedulerWorkerPoolBlockingTest, MaximumWorkersTest) {
                Closure* early_threads_finished) {
               {
                 ScopedBlockingCall scoped_blocking_call(
-                    BlockingType::WILL_BLOCK);
+                    FROM_HERE, BlockingType::WILL_BLOCK);
                 early_threads_barrier_closure->Run();
                 test::WaitWithoutBlockingObserver(
                     early_release_threads_continue);
@@ -1761,7 +1763,7 @@ TEST_P(TaskSchedulerWorkerPoolBlockingCallAndMaxBestEffortTasksTest,
     background_runner->PostTask(
         FROM_HERE, base::BindLambdaForTesting([&]() {
           blocking_best_effort_tasks_running_barrier.Run();
-          ScopedBlockingCall scoped_blocking_call(GetParam());
+          ScopedBlockingCall scoped_blocking_call(FROM_HERE, GetParam());
           test::WaitWithoutBlockingObserver(
               &unblock_blocking_best_effort_tasks);
         }));
@@ -1803,7 +1805,7 @@ INSTANTIATE_TEST_SUITE_P(
     TaskSchedulerWorkerPoolBlockingCallAndMaxBestEffortTasksTest,
     ::testing::Values(BlockingType::WILL_BLOCK));
 
-// Verify that worker detachement doesn't race with worker cleanup, regression
+// Verify that worker detachment doesn't race with worker cleanup, regression
 // test for https://crbug.com/810464.
 TEST_F(TaskSchedulerWorkerPoolImplStartInBodyTest, RacyCleanup) {
 #if defined(OS_FUCHSIA)

base/task/task_scheduler/task_tracker_unittest.cc

@@ -486,7 +486,7 @@ TEST_P(TaskSchedulerTaskTrackerTest, IOAllowed) {
   Task task_with_may_block(FROM_HERE, Bind([]() {
                              // Shouldn't fail.
                              ScopedBlockingCall scope_blocking_call(
-                                 BlockingType::WILL_BLOCK);
+                                 FROM_HERE, BlockingType::WILL_BLOCK);
                            }),
                            TimeDelta());
   TaskTraits traits_with_may_block = TaskTraits(MayBlock(), GetParam());

base/threading/scoped_blocking_call_unittest.cc

@@ -80,7 +80,10 @@ TEST_F(ScopedBlockingCallTest, WillBlockMayBlock) {
                                             BlockingType::WILL_BLOCK);
   testing::Mock::VerifyAndClear(&observer_);
 
-  { ScopedBlockingCall scoped_blocking_call_b(BlockingType::MAY_BLOCK); }
+  {
+    ScopedBlockingCall scoped_blocking_call_b(FROM_HERE,
+                                              BlockingType::MAY_BLOCK);
+  }
 
   EXPECT_CALL(observer_, BlockingEnded());
 }
@@ -90,7 +93,10 @@ TEST_F(ScopedBlockingCallTest, MayBlockMayBlock) {
   ScopedBlockingCall scoped_blocking_call_a(FROM_HERE, BlockingType::MAY_BLOCK);
   testing::Mock::VerifyAndClear(&observer_);
 
-  { ScopedBlockingCall scoped_blocking_call_b(BlockingType::MAY_BLOCK); }
+  {
+    ScopedBlockingCall scoped_blocking_call_b(FROM_HERE,
+                                              BlockingType::MAY_BLOCK);
+  }
 
   EXPECT_CALL(observer_, BlockingEnded());
 }
@@ -101,7 +107,10 @@ TEST_F(ScopedBlockingCallTest, WillBlockWillBlock) {
                                             BlockingType::WILL_BLOCK);
   testing::Mock::VerifyAndClear(&observer_);
 
-  { ScopedBlockingCall scoped_blocking_call_b(BlockingType::WILL_BLOCK); }
+  {
+    ScopedBlockingCall scoped_blocking_call_b(FROM_HERE,
+                                              BlockingType::WILL_BLOCK);
+  }
 
   EXPECT_CALL(observer_, BlockingEnded());
 }
@@ -130,9 +139,9 @@ TEST_F(ScopedBlockingCallTest, MayBlockWillBlockTwice) {
 
 TEST(ScopedBlockingCallDestructionOrderTest, InvalidDestructionOrder) {
   auto scoped_blocking_call_a =
-      std::make_unique<ScopedBlockingCall>(BlockingType::WILL_BLOCK);
+      std::make_unique<ScopedBlockingCall>(FROM_HERE, BlockingType::WILL_BLOCK);
   auto scoped_blocking_call_b =
-      std::make_unique<ScopedBlockingCall>(BlockingType::WILL_BLOCK);
+      std::make_unique<ScopedBlockingCall>(FROM_HERE, BlockingType::WILL_BLOCK);
 
   EXPECT_DCHECK_DEATH({ scoped_blocking_call_a.reset(); });
 }

chrome/browser/component_updater/sth_set_component_installer.cc

@@ -88,7 +88,7 @@ void LoadSTHsFromDisk(
     std::string json_sth;
     {
       base::ScopedBlockingCall scoped_blocking_call(
-          base::BlockingType::MAY_BLOCK);
+          FROM_HERE, base::BlockingType::MAY_BLOCK);
       if (!base::ReadFileToString(sth_file_path, &json_sth)) {
         DVLOG(1) << "Failed reading from " << sth_file_path.value();
         continue;

chrome/browser/download/download_commands.cc

@@ -64,7 +64,7 @@ class ImageClipboardCopyManager : public ImageDecoder::ImageRequest {
 
   void StartDecoding() {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::WILL_BLOCK);
+        FROM_HERE, base::BlockingType::WILL_BLOCK);
 
     // Re-check the filesize since the file may be modified after downloaded.
     int64_t filesize;

chrome/browser/performance_monitor/wmi_refresher.cc

@@ -94,7 +94,8 @@ void WMIRefresher::InitializeDiskIdleTimeConfigImpl(
     WMIRefresher::InitStatus* res) {
   DCHECK(res);
 
-  base::ScopedBlockingCall scoped_blocking_call(base::BlockingType::MAY_BLOCK);
+  base::ScopedBlockingCall scoped_blocking_call(FROM_HERE,
+                                                base::BlockingType::MAY_BLOCK);
 
   // This assumes that CoInitialize(Ex) has already been called on this thread.
   AssertComApartmentType(base::win::ComApartmentType::MTA);

chrome/browser/prefs/incognito_mode_prefs.cc

@@ -96,7 +96,7 @@ class PlatformParentalControlsValue {
   static bool IsParentalControlActivityLoggingOnImpl() {
     // Since we can potentially block, make sure the thread is okay with this.
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     Microsoft::WRL::ComPtr<IWindowsParentalControlsCore> parent_controls;
     HRESULT hr = ::CoCreateInstance(__uuidof(WindowsParentalControls), nullptr,
                                     CLSCTX_ALL, IID_PPV_ARGS(&parent_controls));

chrome/browser/resource_coordinator/leveldb_site_characteristics_database.cc

@@ -228,7 +228,7 @@ LevelDBSiteCharacteristicsDatabase::AsyncHelper::ReadSiteCharacteristicsFromDB(
   std::string protobuf_value;
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     s = db_->Get(read_options_, SerializeOriginIntoDatabaseKey(origin),
                  &protobuf_value);
   }
@@ -256,7 +256,7 @@ void LevelDBSiteCharacteristicsDatabase::AsyncHelper::
   leveldb::Status s;
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     s = db_->Put(write_options_, SerializeOriginIntoDatabaseKey(origin),
                  site_characteristic_proto.SerializeAsString());
   }

chrome/browser/spellchecker/spellcheck_custom_dictionary.cc

@@ -73,7 +73,7 @@ ChecksumStatus LoadFile(const base::FilePath& file_path,
   std::string contents;
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     base::ReadFileToString(file_path, &contents);
   }
   size_t pos = contents.rfind(CHECKSUM_PREFIX);
@@ -159,7 +159,7 @@ void SaveDictionaryFileReliably(const base::FilePath& path,
   content << CHECKSUM_PREFIX << checksum;
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     base::CopyFile(path, path.AddExtension(BACKUP_EXTENSION));
     base::ImportantFileWriter::WriteFileAtomically(path, content.str());
   }

content/browser/renderer_host/dwrite_font_lookup_table_builder_win.cc

@@ -183,7 +183,7 @@ void DWriteFontLookupTableBuilder::BuildFontUniqueNameTable() {
 
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     InitializeDirectWrite();
   }
 
@@ -191,14 +191,14 @@ void DWriteFontLookupTableBuilder::BuildFontUniqueNameTable() {
   font_unique_name_table_ = std::make_unique<blink::FontUniqueNameTable>();
 
   // The |stored_for_platform_version_identifier| proto field is used for
-  // persisting the table to disk and identifiying whether an update to the
+  // persisting the table to disk and identifying whether an update to the
   // table is needed when loading it back. This functionality is not used on
   // Windows, hence setting it to the empty string is sufficient.
   font_unique_name_table_->set_stored_for_platform_version_identifier("");
 
   {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
 
     outstanding_family_results_ = collection_->GetFontFamilyCount();
   }
@@ -254,7 +254,7 @@ DWriteFontLookupTableBuilder::ExtractPathAndNamesFromFamily(
     Microsoft::WRL::ComPtr<IDWriteFont> font;
     {
       base::ScopedBlockingCall scoped_blocking_call(
-          base::BlockingType::MAY_BLOCK);
+          FROM_HERE, base::BlockingType::MAY_BLOCK);
       hr = family->GetFont(font_index, &font);
     }
     if (FAILED(hr))
@@ -268,7 +268,7 @@ DWriteFontLookupTableBuilder::ExtractPathAndNamesFromFamily(
     uint32_t ttc_index = 0;
     {
       base::ScopedBlockingCall scoped_blocking_call(
-          base::BlockingType::MAY_BLOCK);
+          FROM_HERE, base::BlockingType::MAY_BLOCK);
       if (!AddFilesForFont(font.Get(), *windows_fonts_path, &path_set,
                            &custom_font_path_set, &ttc_index)) {
         // It's possible to not be able to retrieve a font file for a font that
@@ -307,7 +307,7 @@ DWriteFontLookupTableBuilder::ExtractPathAndNamesFromFamily(
           BOOL has_id_keyed_names;
           {
             base::ScopedBlockingCall scoped_blocking_call(
-                base::BlockingType::MAY_BLOCK);
+                FROM_HERE, base::BlockingType::MAY_BLOCK);
             hr = font->GetInformationalStrings(
                 font_info_string_id, &font_id_keyed_names, &has_id_keyed_names);
             if (FAILED(hr) || !has_id_keyed_names)

content/browser/tracing/tracing_controller_impl_data_endpoint.cc

@@ -92,7 +92,7 @@ class FileTraceDataEndpoint : public TracingController::TraceDataEndpoint {
 
   bool OpenFileIfNeededOnBlockingThread() {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     if (file_ != nullptr)
       return true;
     file_ = base::OpenFile(file_path_, "w");

device/bluetooth/bluetooth_init_win.cc

@@ -29,7 +29,7 @@ bool HasBluetoothStack() {
 
   if (has_bluetooth_stack == HBS_UNKNOWN) {
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     HRESULT hr = E_FAIL;
     __try {
       hr = __HrLoadAllImportsForDll("bthprops.cpl");

net/base/network_interfaces_win.cc

@@ -217,7 +217,7 @@ bool GetNetworkList(NetworkInterfaceList* networks, int policy) {
   {
     // GetAdaptersAddresses() may require IO operations.
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
 
     adapters = reinterpret_cast<IP_ADAPTER_ADDRESSES*>(&initial_buf);
     ULONG result =

net/dns/dns_config_service_win.cc

@@ -701,7 +701,7 @@ class DnsConfigServiceWin::HostsReader : public SerialWorker {
   void DoWork() override {
     base::TimeTicks start_time = base::TimeTicks::Now();
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     HostsParseWinResult result = HOSTS_PARSE_WIN_UNREADABLE_HOSTS_FILE;
     if (ParseHostsFile(path_, &hosts_))
       result = AddLocalhostEntries(&hosts_);

net/proxy_resolution/dhcp_pac_file_adapter_fetcher_win.cc

@@ -245,7 +245,7 @@ std::string DhcpPacFileAdapterFetcher::GetPacURLFromDhcp(
     // (e.g. http://support.microsoft.com/kb/885270) so we won't take any
     // chances on non-standard, poorly documented usage.
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     res = ::DhcpRequestParams(DHCPCAPI_REQUEST_SYNCHRONOUS,
                               NULL,
                               const_cast<LPWSTR>(adapter_name_wide.c_str()),

net/proxy_resolution/dhcp_pac_file_fetcher_win.cc

@@ -564,7 +564,7 @@ bool DhcpPacFileFetcherWin::GetCandidateAdapterNames(
     adapters.reset(static_cast<IP_ADAPTER_ADDRESSES*>(malloc(adapters_size)));
     // Return only unicast addresses, and skip information we do not need.
     base::ScopedBlockingCall scoped_blocking_call(
-        base::BlockingType::MAY_BLOCK);
+        FROM_HERE, base::BlockingType::MAY_BLOCK);
     error = GetAdaptersAddresses(AF_UNSPEC,
                                  GAA_FLAG_SKIP_ANYCAST |
                                  GAA_FLAG_SKIP_MULTICAST |

sql/database.h

@@ -548,7 +548,7 @@ class COMPONENT_EXPORT(SQL) Database {
   void InitScopedBlockingCall(
       base::Optional<base::ScopedBlockingCall>* scoped_blocking_call) const {
     if (!in_memory_)
-      scoped_blocking_call->emplace(base::BlockingType::MAY_BLOCK);
+      scoped_blocking_call->emplace(FROM_HERE, base::BlockingType::MAY_BLOCK);
   }
 
   // Internal helper for Does*Exist() functions.
@@ -582,7 +582,7 @@ class COMPONENT_EXPORT(SQL) Database {
     // and for error handling.  Set to nullptr for invalid or untracked
     // refs.  |stmt| is the actual statement, and should only be null
     // to create an invalid ref.  |was_valid| indicates whether the
-    // statement should be considered valid for diagnistic purposes.
+    // statement should be considered valid for diagnostic purposes.
     // |was_valid| can be true for a null |stmt| if the Database has
     // been forcibly closed by an error handler.
     StatementRef(Database* database, sqlite3_stmt* stmt, bool was_valid);