Make AppBannerInfoBar install WebAPK.

chrome/browser/banners/app_banner_settings_helper.cc

 // Copyright 2014 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/banners/app_banner_settings_helper.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 179 matching lines @@
 void UpdateMinutesBetweenVisits() {
   std::string param = variations::GetVariationParamValue(
       kBannerParamsKey, kBannerParamsMinutesKey);
   if (!param.empty()) {
     int minimum_minutes = 0;
     if (base::StringToInt(param, &minimum_minutes))
       AppBannerSettingsHelper::SetMinimumMinutesBetweenVisits(minimum_minutes);
   }
 }
 
+std::string getMetric(

[dominickn, 2016/08/25 04:25:56]

This should return const std::string or a base::StringPiece, and be called
GetRapporMetric. Though I think you're removing this method anyway.

[Xi Han, 2016/08/26 17:04:18]

Done.

+    const AppBannerSettingsHelper::AppBannerRapporMetric& rappor_metric) {
+  if (rappor_metric == AppBannerSettingsHelper::NATIVE)
+    return "AppBanner.NativeApp.Installed";
+  else if (rappor_metric == AppBannerSettingsHelper::WEB)
+    return "AppBanner.WebApp.Installed";
+  else
+    return "AppBanner.WebApk.Installed";
+}
+
 }  // namespace
 
 void AppBannerSettingsHelper::ClearHistoryForURLs(
     Profile* profile,
     const std::set<GURL>& origin_urls) {
   HostContentSettingsMap* settings =
       HostContentSettingsMapFactory::GetForProfile(profile);
   for (const GURL& origin_url : origin_urls) {
     settings->SetWebsiteSettingDefaultScope(origin_url, GURL(),
                                             CONTENT_SETTINGS_TYPE_APP_BANNER,
                                             std::string(), nullptr);
     settings->FlushLossyWebsiteSettings();
   }
 }
 
 void AppBannerSettingsHelper::RecordBannerInstallEvent(
     content::WebContents* web_contents,
     const std::string& package_name_or_start_url,
     AppBannerRapporMetric rappor_metric) {
   banners::TrackInstallEvent(banners::INSTALL_EVENT_WEB_APP_INSTALLED);
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, web_contents->GetURL(), package_name_or_start_url,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_ADD_TO_HOMESCREEN,
       banners::AppBannerManager::GetCurrentTime());
 
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(),
-      (rappor_metric == WEB ? "AppBanner.WebApp.Installed"
-                            : "AppBanner.NativeApp.Installed"),
+      getMetric(rappor_metric),
       web_contents->GetURL());
 }
 
 void AppBannerSettingsHelper::RecordBannerDismissEvent(
     content::WebContents* web_contents,
     const std::string& package_name_or_start_url,
     AppBannerRapporMetric rappor_metric) {
   banners::TrackDismissEvent(banners::DISMISS_EVENT_CLOSE_BUTTON);
 
   AppBannerSettingsHelper::RecordBannerEvent(
       web_contents, web_contents->GetURL(), package_name_or_start_url,
       AppBannerSettingsHelper::APP_BANNER_EVENT_DID_BLOCK,
       banners::AppBannerManager::GetCurrentTime());
 
   rappor::SampleDomainAndRegistryFromGURL(
       g_browser_process->rappor_service(),
-      (rappor_metric == WEB ? "AppBanner.WebApp.Dismissed"
-                            : "AppBanner.NativeApp.Dismissed"),
+      getMetric(rappor_metric),
       web_contents->GetURL());
 }
 
 void AppBannerSettingsHelper::RecordBannerEvent(
     content::WebContents* web_contents,
     const GURL& origin_url,
     const std::string& package_name_or_start_url,
     AppBannerEvent event,
     base::Time time) {
   DCHECK(event != APP_BANNER_EVENT_COULD_SHOW);
@@ skipping 391 matching lines @@
     return true;
   }
 
   // Assume any value which is not "0" or "false" indicates that we should use
   // site engagement.
   std::string param = variations::GetVariationParamValue(
       kBannerParamsKey, kBannerSiteEngagementParamsKey);
 
   return (!param.empty() && param != "0" && param != "false");
 }