UKM: Remove UkmService::RecordSource

components/ukm/ukm_service.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 "components/ukm/ukm_service.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
@@ skipping 316 matching lines @@
   // Suppress generating a log if we have no new data to include.
   // TODO(zhenw): add a histogram here to debug if this case is hitting a lot.
   if (sources_.empty() && entries_.empty())
     return;
 
   Report report;
   report.set_client_id(client_id_);
   if (ShouldRecordSessionId())
     report.set_session_id(session_id_);
 
-  for (const auto& source : sources_) {
+  for (const auto& kv : sources_) {
     Source* proto_source = report.add_sources();
-    source->PopulateProto(proto_source);
+    kv.second->PopulateProto(proto_source);
     if (!ShouldRecordInitialUrl())
       proto_source->clear_initial_url();
   }
   for (const auto& entry : entries_) {
     Entry* proto_entry = report.add_entries();
     entry->PopulateProto(proto_entry);
   }
 
   UMA_HISTOGRAM_COUNTS_1000("UKM.Sources.SerializedCount", sources_.size());
   UMA_HISTOGRAM_COUNTS_1000("UKM.Entries.SerializedCount", entries_.size());
@@ skipping 66 matching lines @@
     persisted_logs_.PersistUnsentLogs();
   }
 
   // Error 400 indicates a problem with the log, not with the server, so
   // don't consider that a sign that the server is in trouble.
   bool server_is_healthy = upload_succeeded || response_code == 400;
   scheduler_->UploadFinished(server_is_healthy,
                              persisted_logs_.has_unsent_logs());
 }
 
-void UkmService::RecordSource(std::unique_ptr<UkmSource> source) {
-  DCHECK(thread_checker_.CalledOnValidThread());
-
-  if (!recording_enabled_) {
-    RecordDroppedSource(DroppedDataReason::RECORDING_DISABLED);
-    return;
-  }
-  if (sources_.size() >= GetMaxSources()) {
-    RecordDroppedSource(DroppedDataReason::MAX_HIT);
-    return;
-  }
-
-  sources_.push_back(std::move(source));
-}
-
 // static
 int32_t UkmService::GetNewSourceID() {
   static int32_t next_source_id = 0;
   return next_source_id++;
 }
 
 std::unique_ptr<UkmEntryBuilder> UkmService::GetEntryBuilder(
     int32_t source_id,
     const char* event_name) {
   return std::unique_ptr<UkmEntryBuilder>(new UkmEntryBuilder(
       base::Bind(&UkmService::AddEntry, base::Unretained(this)), source_id,
       event_name));
 }
 
 void UkmService::UpdateSourceURL(int32_t source_id, const GURL& url) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!recording_enabled_) {
     RecordDroppedSource(DroppedDataReason::RECORDING_DISABLED);
     return;
   }
 
   // Update the pre-existing source if there is any. This happens when the
   // initial URL is different from the committed URL for the same source, e.g.,
   // when there is redirection.
-  for (auto& source : sources_) {
-    if (source_id != source->id())
-      continue;
-
-    source->UpdateUrl(url);
+  if (sources_.find(source_id) != sources_.end()) {

[rkaplow, 2017/03/08 18:49:20]

can use ContainsKey 
https://codesearch.chromium.org/chromium/src/base/stl_util.h?type=cs&q=stl+co...

[Zhen Wang, 2017/03/08 19:25:51]

Done.

+    DCHECK(sources_[source_id]);

[rkaplow, 2017/03/08 18:49:20]

i don't think this dcheck is needed, by definition of how we're finding

[Zhen Wang, 2017/03/08 19:25:52]

Done.

+    sources_[source_id]->UpdateUrl(url);
     return;
   }
 
   if (sources_.size() >= GetMaxSources()) {
     RecordDroppedSource(DroppedDataReason::MAX_HIT);
     return;
   }
   std::unique_ptr<UkmSource> source = base::MakeUnique<UkmSource>();
   source->set_id(source_id);
   source->set_url(url);
-  sources_.push_back(std::move(source));
+  sources_.insert(std::make_pair(source_id, std::move(source)));
 }
 
 void UkmService::AddEntry(std::unique_ptr<UkmEntry> entry) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (!recording_enabled_) {
     RecordDroppedEntry(DroppedDataReason::RECORDING_DISABLED);
     return;
   }
   if (entries_.size() >= GetMaxEntries()) {
     RecordDroppedEntry(DroppedDataReason::MAX_HIT);
     return;
   }
 
   entries_.push_back(std::move(entry));
 }
 
 }  // namespace ukm