Reland: Make it clear that AddToHomescreenDataFetcher ignores WebApplicationInfo for WebAPKs

chrome/browser/android/webapps/add_to_homescreen_data_fetcher_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/webapps/add_to_homescreen_data_fetcher.h"
 
 #include <memory>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/nullable_string16.h"
+#include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/common/web_application_info.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/browser/service_worker/embedded_worker_test_helper.h"
 #include "content/browser/service_worker/service_worker_context_core.h"
 #include "content/common/service_worker/service_worker_status_code.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/site_instance.h"
@@ skipping 62 matching lines @@
   content::Manifest manifest_;
   int manifest_fetch_delay_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(MockWebContents);
 };
 
 // Tracks which of the AddToHomescreenDataFetcher::Observer callbacks have been
 // called.
 class ObserverWaiter : public AddToHomescreenDataFetcher::Observer {
  public:
-  ObserverWaiter() {}
+  ObserverWaiter()
+      : is_webapk_compatible_(false),
+        determined_webapk_compatibility_(false),
+        title_available_(false),
+        data_available_(false) {}
   ~ObserverWaiter() override {}
 
   // Waits till the OnDataAvailable() callback is called.
   void WaitForDataAvailable() {
     if (data_available_)
       return;
 
     base::RunLoop run_loop;
     quit_closure_ = run_loop.QuitClosure();
     run_loop.Run();
@@ skipping 73 matching lines @@
 
     scoped_refptr<content::SiteInstance> site_instance =
         content::SiteInstance::Create(browser_context());
     site_instance->GetProcess()->Init();
     MockWebContents* mock_web_contents = new MockWebContents(browser_context());
     mock_web_contents->Init(content::WebContents::CreateParams(
         browser_context(), std::move(site_instance)));
     SetContents(mock_web_contents);
   }
 
+  void TearDown() override {
+    embedded_worker_test_helper_.reset();
+    ChromeRenderViewHostTestHarness::TearDown();
+  }
+
   scoped_refptr<AddToHomescreenDataFetcher> BuildFetcher(
       bool check_webapk_compatible,
       AddToHomescreenDataFetcher::Observer* observer) {
     return new AddToHomescreenDataFetcher(web_contents(), 1, 1, 1, 1,
                                           check_webapk_compatible, observer);
   }
 
   // Set the manifest to be returned as a result of WebContents::GetManifest().
   void SetManifest(const GURL& manifest_url,
                    const content::Manifest& manifest,
@@ skipping 66 matching lines @@
   }
 
   // The value of |check_webapk_compatible| used when building the
   // AddToHomescreenDataFetcher.
   bool check_webapk_compatibility() { return GetParam(); }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AddToHomescreenDataFetcherTestCommon);
 };
 
+// Test that when the manifest provides Manifest::short_name but not
+// Manifest::name that Manifest::short_name is used as the name instead of
+// WebApplicationInfo::title.
+TEST_P(AddToHomescreenDataFetcherTestCommon,
+       ManifestShortNameClobbersWebApplicationName) {
+  WebApplicationInfo web_application_info;
+  web_application_info.title = base::UTF8ToUTF16("Meta Title");
+
+  content::Manifest manifest(BuildDefaultManifest());
+  manifest.name = base::NullableString16();
+
+  RegisterServiceWorker(GURL(kDefaultStartUrl));
+  SetManifest(GURL(kDefaultManifestUrl), manifest, 0);
+
+  ObserverWaiter waiter;
+  scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
+  fetcher->OnDidGetWebApplicationInfo(web_application_info);
+  waiter.WaitForDataAvailable();
+
+  EXPECT_TRUE(base::EqualsASCII(fetcher->shortcut_info().name,
+                                kDefaultManifestShortName));
+
+  fetcher->set_weak_observer(nullptr);
+}
+
+// Test that when the manifest does not provide either Manifest::short_name nor
+// Manifest::name that:
+// - The page is not WebAPK compatible.
+// - WebApplicationInfo::title is used as the "name".
+TEST_P(AddToHomescreenDataFetcherTestCommon, ManifestNoNameNoShortName) {
+    const char* kWebApplicationInfoTitle = "Meta Title";
+    WebApplicationInfo web_application_info;
+    web_application_info.title = base::UTF8ToUTF16(kWebApplicationInfoTitle);
+
+    content::Manifest manifest(BuildDefaultManifest());
+    manifest.name = base::NullableString16();
+    manifest.short_name = base::NullableString16();
+
+    RegisterServiceWorker(GURL(kDefaultStartUrl));

[gone, 2016/12/20 18:44:14]

Lines 327 and 333 are (more or less) repeated three different times, except that
you use 0 vs 10000 and with a different manifest.  Is it worth pulling it out?

+    SetManifest(GURL(kDefaultManifestUrl), manifest, 0);
+
+    ObserverWaiter waiter;
+    scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
+    fetcher->OnDidGetWebApplicationInfo(web_application_info);
+    waiter.WaitForDataAvailable();
+
+    EXPECT_FALSE(waiter.is_webapk_compatible());
+    EXPECT_TRUE(base::EqualsASCII(fetcher->shortcut_info().name,
+                                  kWebApplicationInfoTitle));
+
+    fetcher->set_weak_observer(nullptr);
+}
+
 // Checks that the AddToHomescreenDataFetcher::Observer callbacks are called
 // when a service worker is registered and the manifest fetch times out.
 TEST_P(AddToHomescreenDataFetcherTestCommon, DISABLED_ManifestFetchTimesOut) {
     RegisterServiceWorker(GURL(kDefaultStartUrl));
     SetManifest(GURL(kDefaultManifestUrl), BuildDefaultManifest(), 10000);
 
     ObserverWaiter waiter;
     scoped_refptr<AddToHomescreenDataFetcher> fetcher(BuildFetcher(&waiter));
     fetcher->OnDidGetWebApplicationInfo(WebApplicationInfo());
     waiter.WaitForDataAvailable();
 
     if (check_webapk_compatibility()) {
       EXPECT_TRUE(waiter.determined_webapk_compatibility());
       EXPECT_FALSE(waiter.is_webapk_compatible());
     } else {
       EXPECT_FALSE(waiter.determined_webapk_compatibility());
     }
     // This callback enables the text field in the add-to-homescreen dialog.
     EXPECT_TRUE(waiter.title_available());
 
     fetcher->set_weak_observer(nullptr);
 }
 
 INSTANTIATE_TEST_CASE_P(CheckWebApkCompatibility,
                         AddToHomescreenDataFetcherTestCommon,
                         ::testing::Values(false, true));