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

components/metrics/file_metrics_provider.cc

Index: components/metrics/file_metrics_provider.cc
diff --git a/components/metrics/file_metrics_provider.cc b/components/metrics/file_metrics_provider.cc
index 61297c6e32b198084f64e80e1f2d339cbb8c3b6f..db2c5bc884fdc8ad4a45667806ba1177040700e0 100644
--- a/components/metrics/file_metrics_provider.cc
+++ b/components/metrics/file_metrics_provider.cc
@@ -418,7 +418,7 @@ void FileMetricsProvider::MergeHistogramDeltasFromSource(SourceInfo* source) {
 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());
@@ -554,6 +554,8 @@ bool FileMetricsProvider::ProvideIndependentMetrics(
     RecordSourceAsRead(source);
     sources_to_check_.splice(sources_to_check_.end(), sources_with_profile_,
                              sources_with_profile_.begin());
+    ScheduleSourcesCheck();
+
     if (success)
       return true;
   }