App Banner: require 'display' to be set to 'standalone' or 'fullscreen'.

chrome/browser/banners/app_banner_data_fetcher_unittest.cc

 // Copyright 2015 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_data_fetcher.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "third_party/WebKit/public/platform/WebDisplayMode.h"
 
 namespace banners {
 
 class AppBannerDataFetcherUnitTest : public testing::Test {
  public:
   AppBannerDataFetcherUnitTest() { }
 
  protected:
   static base::NullableString16 ToNullableUTF16(const std::string& str) {
     return base::NullableString16(base::UTF8ToUTF16(str), false);
   }
 
   static content::Manifest GetValidManifest() {
     content::Manifest manifest;
     manifest.name = ToNullableUTF16("foo");
     manifest.short_name = ToNullableUTF16("bar");
     manifest.start_url = GURL("http://example.com");
+    manifest.display = blink::WebDisplayModeStandalone;
 
     content::Manifest::Icon icon;
     icon.type = ToNullableUTF16("image/png");
     icon.sizes.push_back(gfx::Size(144, 144));
     manifest.icons.push_back(icon);
 
     return manifest;
   }
 
   static bool IsManifestValid(const content::Manifest& manifest) {
@@ skipping 24 matching lines @@
   EXPECT_TRUE(IsManifestValid(manifest));
 
   manifest.name = ToNullableUTF16("foo");
   manifest.short_name = base::NullableString16();
   EXPECT_TRUE(IsManifestValid(manifest));
 
   manifest.name = base::NullableString16();
   EXPECT_FALSE(IsManifestValid(manifest));
 }
 
+TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresNonEmptyNameORShortName) {
+  content::Manifest manifest = GetValidManifest();
+
+  manifest.name = ToNullableUTF16("");
+  manifest.short_name = ToNullableUTF16("");
+  EXPECT_FALSE(IsManifestValid(manifest));
+
+  manifest.name = ToNullableUTF16("foo");
+  EXPECT_TRUE(IsManifestValid(manifest));
+
+  manifest.short_name = ToNullableUTF16("");
+  EXPECT_TRUE(IsManifestValid(manifest));

[dominickn, 2016/03/23 11:40:53]

Nit: Isn't short_name already empty at this point? This should set short_name to
something not empty, EXPECT_TRUE, then blank out name and EXPECT_TRUE right?

[mlamouri (slow - plz ping), 2016/03/23 11:46:10]

Correct. I did some changes before upload that made part of this test less
useful.

+
+  manifest.name = ToNullableUTF16("");
+  EXPECT_FALSE(IsManifestValid(manifest));
+}
+
 TEST_F(AppBannerDataFetcherUnitTest, ManifestRequiresValidStartURL) {
   content::Manifest manifest = GetValidManifest();
 
   manifest.start_url = GURL();
   EXPECT_FALSE(IsManifestValid(manifest));
 
   manifest.start_url = GURL("/");
   EXPECT_FALSE(IsManifestValid(manifest));
 }
 
@@ skipping 23 matching lines @@
 
   // Non-square is okay.
   manifest.icons[0].sizes[1] = gfx::Size(144, 200);
   EXPECT_TRUE(IsManifestValid(manifest));
 
   // The representation of the keyword 'any' should be recognized.
   manifest.icons[0].sizes[1] = gfx::Size(0, 0);
   EXPECT_TRUE(IsManifestValid(manifest));
 }
 
+TEST_F(AppBannerDataFetcherUnitTest, ManifestDisplayStandaloneFullscreen) {
+  content::Manifest manifest = GetValidManifest();
+
+  manifest.display = blink::WebDisplayModeUndefined;
+  EXPECT_FALSE(IsManifestValid(manifest));
+
+  manifest.display = blink::WebDisplayModeBrowser;
+  EXPECT_FALSE(IsManifestValid(manifest));
+
+  manifest.display = blink::WebDisplayModeMinimalUi;
+  EXPECT_FALSE(IsManifestValid(manifest));
+
+  manifest.display = blink::WebDisplayModeStandalone;
+  EXPECT_TRUE(IsManifestValid(manifest));
+
+  manifest.display = blink::WebDisplayModeFullscreen;
+  EXPECT_TRUE(IsManifestValid(manifest));
+}
+
 }  // namespace banners