Add new app banner metrics using InstallableStatusCode.

chrome/browser/installable/installable_manager.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 "chrome/browser/installable/installable_manager.h"
 
 #include "base/bind.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/manifest/manifest_icon_downloader.h"
 #include "chrome/browser/manifest/manifest_icon_selector.h"
@@ skipping 37 matching lines @@
   }
 
   return false;
 }
 
 }  // namespace
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(InstallableManager);
 
 struct InstallableManager::ManifestProperty {
-  InstallableErrorCode error = NO_ERROR_DETECTED;
+  InstallableStatusCode error = NO_ERROR_DETECTED;
   GURL url;
   content::Manifest manifest;
   bool fetched = false;
 };
 
 struct InstallableManager::InstallableProperty {
-  InstallableErrorCode error = NO_ERROR_DETECTED;
+  InstallableStatusCode error = NO_ERROR_DETECTED;
   bool installable = false;
   bool fetched = false;
 };
 
 struct InstallableManager::IconProperty {
   IconProperty() :
     error(NO_ERROR_DETECTED), url(), icon(), fetched(false) { }
   IconProperty(IconProperty&& other) = default;
   IconProperty& operator=(IconProperty&& other) = default;
 
-  InstallableErrorCode error = NO_ERROR_DETECTED;
+  InstallableStatusCode error = NO_ERROR_DETECTED;
   GURL url;
   std::unique_ptr<SkBitmap> icon;
   bool fetched;
 
  private:
   // This class contains a std::unique_ptr and therefore must be move-only.
   DISALLOW_COPY_AND_ASSIGN(IconProperty);
 };
 
 
@@ skipping 63 matching lines @@
 
 void InstallableManager::SetIconFetched(const InstallableParams& params) {
   GetIcon(params).fetched = true;
 }
 
 InstallableManager::IconProperty& InstallableManager::GetIcon(
     const InstallableParams& params) {
   return icons_[{params.ideal_icon_size_in_dp, params.minimum_icon_size_in_dp}];
 }
 
-InstallableErrorCode InstallableManager::GetErrorCode(
+InstallableStatusCode InstallableManager::GetErrorCode(
     const InstallableParams& params) {
   if (manifest_->error != NO_ERROR_DETECTED)
     return manifest_->error;
 
   if (params.check_installable && installable_->error != NO_ERROR_DETECTED)
     return installable_->error;
 
   if (params.fetch_valid_icon) {
     IconProperty& icon = GetIcon(params);
     if (icon.error != NO_ERROR_DETECTED)
       return icon.error;
   }
 
   return NO_ERROR_DETECTED;
 }
 
-InstallableErrorCode InstallableManager::manifest_error() const {
+InstallableStatusCode InstallableManager::manifest_error() const {
   return manifest_->error;
 }
 
-InstallableErrorCode InstallableManager::installable_error() const {
+InstallableStatusCode InstallableManager::installable_error() const {
   return installable_->error;
 }
 
 void InstallableManager::set_installable_error(
-    InstallableErrorCode error_code) {
+    InstallableStatusCode error_code) {
   installable_->error = error_code;
 }
 
-InstallableErrorCode InstallableManager::icon_error(
+InstallableStatusCode InstallableManager::icon_error(
     const InstallableManager::IconParams& icon_params) {
   return icons_[icon_params].error;
 }
 
 GURL& InstallableManager::icon_url(
     const InstallableManager::IconParams& icon_params) {
   return icons_[icon_params].url;
 }
 
 const SkBitmap* InstallableManager::icon(
@@ skipping 43 matching lines @@
   if (tasks_.empty()) {
     is_active_ = false;
     return;
   }
 
   DCHECK(is_active_);
   WorkOnTask();
 }
 
 void InstallableManager::RunCallback(const Task& task,
-                                     InstallableErrorCode code) {
+                                     InstallableStatusCode code) {
   const InstallableParams& params = task.first;
   IconProperty& icon = GetIcon(params);
   InstallableData data = {
       code,
       manifest_url(),
       manifest(),
       params.fetch_valid_icon ? icon.url : GURL::EmptyGURL(),
       params.fetch_valid_icon ? icon.icon.get() : nullptr,
       params.check_installable ? is_installable() : false};
 
   task.second.Run(data);
 }
 
 void InstallableManager::WorkOnTask() {
   DCHECK(!tasks_.empty());
   const Task& task = tasks_[0];
   const InstallableParams& params = task.first;
 
-  InstallableErrorCode code = GetErrorCode(params);
+  InstallableStatusCode code = GetErrorCode(params);
   if (code != NO_ERROR_DETECTED || IsComplete(params)) {
     RunCallback(task, code);
     tasks_.erase(tasks_.begin());
     StartNextTask();
     return;
   }
 
   if (!manifest_->fetched)
     FetchManifest();
   else if (params.check_installable && !installable_->fetched)
@@ skipping 151 matching lines @@
 }
 
 bool InstallableManager::is_installable() const {
   return installable_->installable;
 }
 
 // static
 int InstallableManager::GetMinimumIconSizeInPx() {
   return kIconMinimumSizeInPx;
 }