[Play Billing] Prevent DGAPI from being available in Incognito mode.

Check to see if a browser is in Incognito mode before returning a DGAPI
interface.

Bug: 1159592
Change-Id: Ia1619ad87ff2dc3cd689801b1e014b7fe39f78b3
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2596556
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: Rouslan Solomakhin <rouslan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#839535}

chrome/browser/apps/digital_goods/util.cc

@@ -7,6 +7,8 @@
 #include "base/optional.h"
 #include "chrome/browser/chromeos/apps/apk_web_app_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/web_applications/app_browser_controller.h"
 #include "chrome/browser/web_applications/components/app_registrar.h"
 #include "chrome/browser/web_applications/web_app_provider.h"
 #include "content/public/browser/render_document_host_user_data.h"
@@ -15,9 +17,23 @@
 namespace apps {
 
 std::string GetTwaPackageName(content::RenderFrameHost* render_frame_host) {
-  auto* apk_web_app_service = chromeos::ApkWebAppService::Get(
-      Profile::FromBrowserContext(render_frame_host->GetBrowserContext()));
+  auto* web_contents =
+      content::WebContents::FromRenderFrameHost(render_frame_host);
+  if (!web_contents)
+    return "";
+
+  Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
+  if (!web_app::AppBrowserController::IsWebApp(browser)) {
+    return "";
+  }
+
+  auto* profile =
+      Profile::FromBrowserContext(render_frame_host->GetBrowserContext());
+  if (profile->IsIncognitoProfile()) {
+    return "";
+  }
 
+  auto* apk_web_app_service = chromeos::ApkWebAppService::Get(profile);
   if (!apk_web_app_service) {
     return "";
   }

chrome/browser/apps/digital_goods/util.h

@@ -13,6 +13,12 @@ class RenderFrameHost;
 
 namespace apps {
 
+/**
+ * Gets the TWA package name associated with the website present in the
+ * render frame host. An empty string will be retured if there is no associated
+ * TWA, if the website is in an Incognito tab, or if the website is not in a
+ * web app window.
+ */
 std::string GetTwaPackageName(content::RenderFrameHost* render_frame_host);
 std::string GetScope(content::RenderFrameHost* render_frame_host);
 

chrome/browser/payments/chrome_payment_request_delegate.cc

@@ -22,6 +22,7 @@
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/payments/payment_request_dialog_view.h"
+#include "chrome/browser/ui/web_applications/app_browser_controller.h"
 #include "chrome/browser/web_data_service_factory.h"
 #include "components/autofill/content/browser/webauthn/internal_authenticator_impl.h"
 #include "components/autofill/core/browser/address_normalizer_impl.h"
@@ -272,7 +273,7 @@ std::string ChromePaymentRequestDelegate::GetTwaPackageName() const {
     return "";
 
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents);
-  if (!browser || !browser->app_controller())
+  if (!web_app::AppBrowserController::IsWebApp(browser))
     return "";
 
   auto* apk_web_app_service = chromeos::ApkWebAppService::Get(