Remove ChromeWebApkHost::GetGooglePlayInstallState() check from WebApkInstaller

chrome/browser/android/webapk/webapk_installer_unittest.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/android/webapk/webapk_installer.h"
 
 #include <jni.h>
 #include <memory>
 #include <string>
 
@@ skipping 47 matching lines @@
 // WebApkInstaller subclass where
 // WebApkInstaller::StartInstallingDownloadedWebApk() and
 // WebApkInstaller::StartUpdateUsingDownloadedWebApk() and
 // WebApkInstaller::CanUseGooglePlayInstallService() and
 // WebApkInstaller::InstallOrUpdateWebApkFromGooglePlay() are stubbed out.
 class TestWebApkInstaller : public WebApkInstaller {
  public:
   TestWebApkInstaller(content::BrowserContext* browser_context,
                       const ShortcutInfo& shortcut_info,
                       const SkBitmap& primary_icon,
-                      const SkBitmap& badge_icon,
-                      bool can_install_webapks)
+                      const SkBitmap& badge_icon)
       : WebApkInstaller(browser_context,
                         shortcut_info,
                         primary_icon,
-                        badge_icon),
-        can_install_webapks_(can_install_webapks) {}
-
-  bool CanInstallWebApks() override { return can_install_webapks_; }
+                        badge_icon) {}
 
   void InstallOrUpdateWebApk(const std::string& package_name,
                              int version,
                              const std::string& token) override {
     PostTaskToRunSuccessCallback();
   }
 
   void PostTaskToRunSuccessCallback() {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
         base::Bind(&TestWebApkInstaller::OnResult, base::Unretained(this),
                    WebApkInstallResult::SUCCESS));
   }
 
  private:
-  // Whether the Google Play Services can be used and the install delegate is
-  // available.
-  bool can_install_webapks_;
-
   DISALLOW_COPY_AND_ASSIGN(TestWebApkInstaller);
 };
 
 // Runs the WebApkInstaller installation process/update and blocks till done.
 class WebApkInstallerRunner {
  public:
   WebApkInstallerRunner(content::BrowserContext* browser_context,
                         const GURL& best_primary_icon_url,
                         const GURL& best_badge_icon_url)
       : browser_context_(browser_context),
         best_primary_icon_url_(best_primary_icon_url),
-        best_badge_icon_url_(best_badge_icon_url),
-        can_install_webapks_(true) {}
+        best_badge_icon_url_(best_badge_icon_url) {}
 
   ~WebApkInstallerRunner() {}
 
-  void SetCanInstallWebApks(bool can_install_webapks) {
-    can_install_webapks_ = can_install_webapks;
-  }
-
   void RunInstallWebApk() {
     WebApkInstaller::InstallAsyncForTesting(
         CreateWebApkInstaller(), base::Bind(&WebApkInstallerRunner::OnCompleted,
                                             base::Unretained(this)));
     Run();
   }
 
   void RunUpdateWebApk() {
     const int kWebApkVersion = 1;
 
     std::map<std::string, std::string> icon_url_to_murmur2_hash{
         {best_primary_icon_url_.spec(), "0"},
         {best_badge_icon_url_.spec(), "0"}};
 
     WebApkInstaller::UpdateAsyncForTesting(
         CreateWebApkInstaller(), kDownloadedWebApkPackageName, kWebApkVersion,
         icon_url_to_murmur2_hash, false /* is_manifest_stale */,
         base::Bind(&WebApkInstallerRunner::OnCompleted,
                    base::Unretained(this)));
     Run();
   }
 
   WebApkInstaller* CreateWebApkInstaller() {
     ShortcutInfo info(GURL::EmptyGURL());
     info.best_primary_icon_url = best_primary_icon_url_;
     info.best_badge_icon_url = best_badge_icon_url_;
 
     // WebApkInstaller owns itself.
-    WebApkInstaller* installer = new TestWebApkInstaller(
-        browser_context_, info, SkBitmap(), SkBitmap(), can_install_webapks_);
+    WebApkInstaller* installer =
+        new TestWebApkInstaller(browser_context_, info, SkBitmap(), SkBitmap());
     installer->SetTimeoutMs(100);
     return installer;
   }
 
   void Run() {
     base::RunLoop run_loop;
     on_completed_callback_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
@@ skipping 12 matching lines @@
   // The Web Manifest's icon URLs.
   const GURL best_primary_icon_url_;
   const GURL best_badge_icon_url_;
 
   // Called after the installation process has succeeded or failed.
   base::Closure on_completed_callback_;
 
   // The result of the installation process.
   WebApkInstallResult result_;
 
-  // Whether the device supports installation of WebApks.
-  bool can_install_webapks_;
-
   DISALLOW_COPY_AND_ASSIGN(WebApkInstallerRunner);
 };
 
 // Builds a webapk::WebApkResponse with |token| as the token from the WebAPK
 // server.
 std::unique_ptr<net::test_server::HttpResponse> BuildValidWebApkResponse(
     const std::string& token) {
   std::unique_ptr<webapk::WebApkResponse> response_proto(
       new webapk::WebApkResponse);
   response_proto->set_package_name(kDownloadedWebApkPackageName);
@@ skipping 19 matching lines @@
   void BuildSync(
       const GURL& best_primary_icon_url,
       const GURL& best_badge_icon_url,
       const std::map<std::string, std::string>& icon_url_to_murmur2_hash,
       bool is_manifest_stale) {
     ShortcutInfo info(GURL::EmptyGURL());
     info.best_primary_icon_url = best_primary_icon_url;
     info.best_badge_icon_url = best_badge_icon_url;
 
     // WebApkInstaller owns itself.
-    WebApkInstaller* installer = new TestWebApkInstaller(
-        browser_context_, info, SkBitmap(), SkBitmap(), false);
+    WebApkInstaller* installer =
+        new TestWebApkInstaller(browser_context_, info, SkBitmap(), SkBitmap());
     installer->BuildWebApkProtoInBackgroundForTesting(
         base::Bind(&BuildProtoRunner::OnBuiltWebApkProto,
                    base::Unretained(this)),
         icon_url_to_murmur2_hash, is_manifest_stale);
 
     base::RunLoop run_loop;
     on_completed_callback_ = run_loop.QuitClosure();
     run_loop.Run();
   }
 
@@ skipping 306 matching lines @@
   EXPECT_FALSE(icons[0].has_image_data());
 
   // Check protobuf fields for kBestPrimaryIconUrl.
   EXPECT_EQ(best_icon_url, icons[1].src());
   EXPECT_EQ(icon_url_to_murmur2_hash[best_icon_url], icons[1].hash());
   EXPECT_THAT(icons[1].usages(),
               testing::ElementsAre(webapk::Image::PRIMARY_ICON,
                                    webapk::Image::BADGE_ICON));
   EXPECT_TRUE(icons[1].has_image_data());
 }
-
-TEST_F(WebApkInstallerTest, FailsWhenInstallDisabled) {
-  std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
-  runner->SetCanInstallWebApks(false);
-  runner->RunInstallWebApk();
-  EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
-}