ExternalDataUseObserver matches package names

chrome/browser/android/data_usage/external_data_use_observer.cc

 // Copyright 2015 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 "chrome/browser/android/data_usage/external_data_use_observer.h"
 
 #include <utility>
 
 #include "base/android/jni_string.h"
 #include "base/containers/hash_tables.h"
@@ skipping 181 matching lines @@
 base::WeakPtr<ExternalDataUseObserver> ExternalDataUseObserver::GetIOWeakPtr() {
   return io_weak_factory_.GetWeakPtr();
 }
 
 base::WeakPtr<ExternalDataUseObserver> ExternalDataUseObserver::GetUIWeakPtr() {
   return ui_weak_factory_.GetWeakPtr();
 }
 
 void ExternalDataUseObserver::OnReportDataUseDoneOnIOThread(bool success) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  DCHECK(!buffered_data_reports_.empty());
   DCHECK(submit_data_report_pending_);
 
   // TODO(tbansal): If not successful, record UMA.
 
   submit_data_report_pending_ = false;
 
   SubmitBufferedDataUseReport();
 }
 
 void ExternalDataUseObserver::OnDataUse(
@@ skipping 166 matching lines @@
 }
 
 bool ExternalDataUseObserver::Matches(const GURL& gurl,
                                       std::string* label) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   *label = "";
 
   if (!gurl.is_valid() || gurl.is_empty())
     return false;
 
-  for (size_t i = 0; i < matching_rules_.size(); ++i) {
-    const re2::RE2* pattern = matching_rules_[i]->pattern();
+  for (const auto* matching_rule : matching_rules_) {
+    const re2::RE2* pattern = matching_rule->pattern();
     if (re2::RE2::FullMatch(gurl.spec(), *pattern)) {
-      *label = matching_rules_[i]->label();
+      *label = matching_rule->label();
       return true;
     }
   }
+
+  return false;
+}
+
+bool ExternalDataUseObserver::MatchesAppPackageName(
+    const std::string& app_package_name,
+    std::string* label) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  *label = "";
+
+  if (app_package_name.empty())
+    return false;
+
+  for (const auto* matching_rule : matching_rules_) {
+    if (app_package_name == matching_rule->app_package_name()) {
+      *label = matching_rule->label();
+      return true;
+    }
+  }
 
   return false;
 }
 
 ExternalDataUseObserver::DataUseReportKey::DataUseReportKey(
     const std::string& label,
     net::NetworkChangeNotifier::ConnectionType connection_type,
     const std::string& mcc_mnc)
     : label(label), connection_type(connection_type), mcc_mnc(mcc_mnc) {}
 
@@ skipping 37 matching lines @@
     : app_package_name_(app_package_name),
       pattern_(pattern.Pass()),
       label_(label) {}
 
 ExternalDataUseObserver::MatchingRule::~MatchingRule() {}
 
 const re2::RE2* ExternalDataUseObserver::MatchingRule::pattern() const {
   return pattern_.get();
 }
 
+const std::string& ExternalDataUseObserver::MatchingRule::app_package_name()
+    const {
+  return app_package_name_;
+}
+
 const std::string& ExternalDataUseObserver::MatchingRule::label() const {
   return label_;
 }
 
 bool RegisterExternalDataUseObserver(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android
 
 }  // namespace chrome