Chrome app manifest support for action handlers.

chrome/browser/chromeos/note_taking_helper_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/chromeos/note_taking_helper.h"
 
 #include <utility>
 
 #include "ash/common/ash_switches.h"
 #include "base/bind.h"
@@ skipping 174 matching lines @@
     profile()->GetPrefs()->SetBoolean(prefs::kArcEnabled, flags & ENABLE_ARC);
     NoteTakingHelper::Initialize();
     NoteTakingHelper::Get()->set_launch_chrome_app_callback_for_test(base::Bind(
         &NoteTakingHelperTest::LaunchChromeApp, base::Unretained(this)));
   }
 
   // Creates an extension.
   scoped_refptr<const extensions::Extension> CreateExtension(
       const extensions::ExtensionId& id,
       const std::string& name) {
+    return CreateExtension(id, name, nullptr);
+  }
+  scoped_refptr<const extensions::Extension> CreateExtension(
+      const extensions::ExtensionId& id,
+      const std::string& name,
+      std::unique_ptr<base::Value> action_handlers) {
     std::unique_ptr<base::DictionaryValue> manifest =
         extensions::DictionaryBuilder()
             .Set("name", name)
             .Set("version", "1.0")
             .Set("manifest_version", 2)
             .Set("app",
                  extensions::DictionaryBuilder()
                      .Set("background",
                           extensions::DictionaryBuilder()
                               .Set("scripts", extensions::ListBuilder()
                                                   .Append("background.js")
                                                   .Build())
                               .Build())
                      .Build())
             .Build();
+
+    if (action_handlers)
+      manifest->Set("action_handlers", std::move(action_handlers));
+
     return extensions::ExtensionBuilder()
         .SetManifest(std::move(manifest))
         .SetID(id)
         .Build();
   }
 
   // Initializes extensions-related objects for |profile|. Tests only need to
   // call this if they create additional profiles of their own.
   void InitExtensionService(Profile* profile) {
     extensions::TestExtensionSystem* extension_system =
@@ skipping 119 matching lines @@
   apps = helper()->GetAvailableApps(profile());
   ASSERT_EQ(2u, apps.size());
   EXPECT_EQ(
       GetAppString(NoteTakingHelper::kDevKeepExtensionId, kDevName, false),
       GetAppString(apps[0]));
   EXPECT_EQ(
       GetAppString(NoteTakingHelper::kProdKeepExtensionId, kProdName, true),
       GetAppString(apps[1]));
 }
 
+// Verify the note helper detects apps with "new_note" "action_handler" manifest
+// entries.
+TEST_F(NoteTakingHelperTest, CustomChromeApps) {
+  Init(ENABLE_PALETTE);
+
+  const extensions::ExtensionId kNewNoteId = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
+  const extensions::ExtensionId kInvalidNewNoteId =

[Daniel Erat, 2017/01/12 23:55:03]

i think you aren't using this. did you mean to create one with a different
handler?

[jdufault, 2017/01/14 00:30:42]

Artifact from a previous patch before extension parsing was done via a manifest
handler. Removed.

+      "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
+  const extensions::ExtensionId kEmptyArrayId =
+      "cccccccccccccccccccccccccccccccc";
+  const extensions::ExtensionId kEmptyId = "dddddddddddddddddddddddddddddddd";
+  const std::string kName = "Some App";
+
+  // "action_handlers": ["new_note"]
+  auto has_new_note = CreateExtension(
+      kNewNoteId, kName,
+      extensions::ListBuilder()
+          .Append(app_runtime::ToString(app_runtime::ACTION_TYPE_NEW_NOTE))
+          .Build());
+  InstallExtension(has_new_note.get(), profile());
+  // "action_handlers": []
+  auto empty_array =
+      CreateExtension(kEmptyArrayId, kName, extensions::ListBuilder().Build());
+  InstallExtension(empty_array.get(), profile());
+  // (no action handler entry)
+  auto none = CreateExtension(kEmptyId, kName);
+  InstallExtension(none.get(), profile());
+
+  // Only the "new_note" extension is returned from GetAvailableApps.
+  std::vector<NoteTakingAppInfo> apps = helper()->GetAvailableApps(profile());
+  ASSERT_EQ(1u, apps.size());
+  EXPECT_EQ(GetAppString(kNewNoteId, kName, false), GetAppString(apps[0]));

[Daniel Erat, 2017/01/12 23:55:03]

consider adding a test to check that whitelisted apps aren't listed twice

[jdufault, 2017/01/14 00:30:42]

Done.

+}
+
 TEST_F(NoteTakingHelperTest, LaunchChromeApp) {
   Init(ENABLE_PALETTE);
   auto extension =
       CreateExtension(NoteTakingHelper::kProdKeepExtensionId, "Keep");
   InstallExtension(extension.get(), profile());
 
   // Check the Chrome app is launched with the correct parameters.
   HistogramTester histogram_tester;
   const base::FilePath kPath("/foo/bar/photo.jpg");
   helper()->LaunchAppForNewNote(profile(), kPath);
@@ skipping 270 matching lines @@
   InitExtensionService(second_profile);
   EXPECT_EQ(0, observer.num_updates());
   InstallExtension(keep_extension.get(), second_profile);
   EXPECT_EQ(1, observer.num_updates());
   UninstallExtension(keep_extension.get(), second_profile);
   EXPECT_EQ(2, observer.num_updates());
   profile_manager_->DeleteTestingProfile(kSecondProfileName);
 }
 
 }  // namespace chromeos