Put BrowserMetrics with embedded profiles into subdir for auto-upload.

components/metrics/file_metrics_provider.cc

 // 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.
 
 #include "components/metrics/file_metrics_provider.h"
 
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
@@ skipping 400 matching lines @@
 
   source->read_complete = true;
   DVLOG(1) << "Reported " << histogram_count << " histograms from "
            << source->path.value();
 }
 
 // static
 void FileMetricsProvider::RecordHistogramSnapshotsFromSource(
     base::HistogramSnapshotManager* snapshot_manager,
     SourceInfo* source) {
-  DCHECK_EQ(SOURCE_HISTOGRAMS_ATOMIC_FILE, source->type);
+  DCHECK_NE(SOURCE_HISTOGRAMS_ACTIVE_FILE, source->type);
 
   base::PersistentHistogramAllocator::Iterator histogram_iter(
       source->allocator.get());
 
   int histogram_count = 0;
   while (true) {
     std::unique_ptr<base::HistogramBase> histogram = histogram_iter.GetNext();
     if (!histogram)
       break;
     snapshot_manager->PrepareFinalDelta(histogram.get());
@@ skipping 115 matching lines @@
     } else {
       RecordEmbeddedProfileResult(EMBEDDED_PROFILE_DROPPED);
     }
 
     // Regardless of whether this source was successfully recorded, it is never
     // read again.
     source->read_complete = true;
     RecordSourceAsRead(source);
     sources_to_check_.splice(sources_to_check_.end(), sources_with_profile_,
                              sources_with_profile_.begin());
+    ScheduleSourcesCheck();
+
     if (success)
       return true;
   }
 
   return false;
 }
 
 bool FileMetricsProvider::HasInitialStabilityMetrics() {
   DCHECK(thread_checker_.CalledOnValidThread());
 
@@ skipping 85 matching lines @@
   // important to know how much total "jank" may be introduced.
   SCOPED_UMA_HISTOGRAM_TIMER("UMA.FileMetricsProvider.SnapshotTime.Total");
 
   for (std::unique_ptr<SourceInfo>& source : sources_mapped_) {
     SCOPED_UMA_HISTOGRAM_TIMER("UMA.FileMetricsProvider.SnapshotTime.File");
     MergeHistogramDeltasFromSource(source.get());
   }
 }
 
 }  // namespace metrics