Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4395)

Unified Diff: chrome/browser/android/webapk/webapk_installer_unittest.cc

Issue 2733543002: [Android:WebAPK] Don't add webapp to homescreen if WebAPK install times out part 1/3 (Closed)
Patch Set: Merge branch 'start' into refactor_shortcut_helper3 Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/android/webapk/webapk_installer_unittest.cc
diff --git a/chrome/browser/android/webapk/webapk_installer_unittest.cc b/chrome/browser/android/webapk/webapk_installer_unittest.cc
index 3b8997cd28b7d43bb58a9bac713630b635b694aa..7a12d954f3351ed2ee9ef3185600f90fb6b2caa1 100644
--- a/chrome/browser/android/webapk/webapk_installer_unittest.cc
+++ b/chrome/browser/android/webapk/webapk_installer_unittest.cc
@@ -19,6 +19,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/android/shortcut_info.h"
#include "chrome/browser/android/webapk/webapk.pb.h"
+#include "chrome/browser/android/webapk/webapk_install_service.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/browser/browser_thread.h"
@@ -92,7 +93,8 @@ class TestWebApkInstaller : public WebApkInstaller {
void PostTaskToRunSuccessCallback() {
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
- base::Bind(&TestWebApkInstaller::OnSuccess, base::Unretained(this)));
+ base::Bind(&TestWebApkInstaller::OnResult, base::Unretained(this),
+ WebApkInstallResult::SUCCESS));
}
private:
@@ -158,13 +160,13 @@ class WebApkInstallerRunner {
run_loop.Run();
}
- bool success() { return success_; }
+ WebApkInstallResult result() { return result_; }
private:
- void OnCompleted(bool success,
+ void OnCompleted(WebApkInstallResult result,
bool relax_updates,
const std::string& webapk_package) {
- success_ = success;
+ result_ = result;
on_completed_callback_.Run();
}
@@ -176,8 +178,8 @@ class WebApkInstallerRunner {
// Called after the installation process has succeeded or failed.
base::Closure on_completed_callback_;
- // Whether the installation process succeeded.
- bool success_;
+ // The result of the installation process.
+ WebApkInstallResult result_;
// Whether Google Play Service can be used and the install delegate is
// available.
@@ -345,7 +347,7 @@ class WebApkInstallerTest : public ::testing::Test {
TEST_F(WebApkInstallerTest, Success) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::SUCCESS, runner->result());
}
// Test that installation fails if fetching the bitmap at the best primary icon
@@ -357,7 +359,7 @@ TEST_F(WebApkInstallerTest, BestPrimaryIconUrlDownloadTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
}
// Test that installation fails if the WebAPK creation request times out.
@@ -367,7 +369,7 @@ TEST_F(WebApkInstallerTest, CreateWebApkRequestTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
}
// Test that installation fails if the WebAPK download times out.
@@ -377,7 +379,7 @@ TEST_F(WebApkInstallerTest, WebApkDownloadTimesOut) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
}
// Test that installation fails if the WebAPK download fails.
@@ -387,7 +389,7 @@ TEST_F(WebApkInstallerTest, WebApkDownloadFails) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
}
namespace {
@@ -411,14 +413,14 @@ TEST_F(WebApkInstallerTest, UnparsableCreateWebApkResponse) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunInstallWebApk();
- EXPECT_FALSE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::FAILURE, runner->result());
}
// Test update succeeding.
TEST_F(WebApkInstallerTest, UpdateSuccess) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunUpdateWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::SUCCESS, runner->result());
}
// Test that an update suceeds if the WebAPK server returns a HTTP response with
@@ -433,7 +435,7 @@ TEST_F(WebApkInstallerTest, UpdateSuccessWithEmptyDownloadUrlInResponse) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->RunUpdateWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::SUCCESS, runner->result());
}
// Test installation succeeds using Google Play.
@@ -441,7 +443,7 @@ TEST_F(WebApkInstallerTest, InstallFromGooglePlaySuccess) {
std::unique_ptr<WebApkInstallerRunner> runner = CreateWebApkInstallerRunner();
runner->SetCanUseGooglePlayInstallService(true);
runner->RunInstallWebApk();
- EXPECT_TRUE(runner->success());
+ EXPECT_EQ(WebApkInstallResult::SUCCESS, runner->result());
}
// When there is no Web Manifest available for a site, an empty
« no previous file with comments | « chrome/browser/android/webapk/webapk_installer.cc ('k') | chrome/browser/android/webapk/webapk_update_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698