Extension install prompt: in the delegated permissions prompt, include optional permissions

chrome/browser/extensions/extension_install_prompt_unittest.cc

 // Copyright 2014 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 "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ skipping 35 matching lines @@
       new PermissionSet(api_permissions,
                         ManifestPermissionSet(),
                         URLPatternSet(),
                         URLPatternSet());
   scoped_refptr<const Extension> extension =
       ExtensionBuilder().SetManifest(
           DictionaryBuilder().Set("name", "foo")
                              .Set("version", "1.0")
                              .Set("manifest_version", 2)
                              .Set("description", "Random Ext")).Build();
-  ExtensionInstallPrompt prompt(NULL /* no web contents in this test */);
+  ExtensionInstallPrompt prompt(nullptr /* no web contents in this test */);
   base::RunLoop run_loop;
   prompt.set_callback_for_test(
       base::Bind(&VerifyPromptPermissionsCallback,
                  run_loop.QuitClosure(),
                  1u,  // |regular_permissions_count|.
                  0u));  // |withheld_permissions_count|.
-  prompt.ConfirmPermissions(NULL,  // no delegate
+  prompt.ConfirmPermissions(nullptr,  // no delegate
                             extension.get(),
                             permission_set.get());
   run_loop.Run();
 }
 
 TEST(ExtensionInstallPromptUnittest, PromptShowsWithheldPermissions) {
   content::TestBrowserThreadBundle thread_bundle;
 
   // Enable consent flag so that <all_hosts> permissions get withheld.
   FeatureSwitch::ScopedOverride enable_scripts_switch(
       FeatureSwitch::scripts_require_action(), true);
 
   ListBuilder permissions;
   permissions.Append("http://*/*");
   permissions.Append("http://www.google.com/");
   permissions.Append("tabs");
   scoped_refptr<const Extension> extension =
       ExtensionBuilder().SetManifest(
           DictionaryBuilder().Set("name", "foo")
                              .Set("version", "1.0")
                              .Set("manifest_version", 2)
                              .Set("description", "Random Ext")
                              .Set("permissions", permissions)).Build();
-  ExtensionInstallPrompt prompt(NULL /* no web contents in this test */);
+  ExtensionInstallPrompt prompt(nullptr /* no web contents in this test */);
   base::RunLoop run_loop;
 
   // We expect <all_hosts> to be withheld, but http://www.google.com/ and tabs
   // permissions should be granted as regular permissions.
   prompt.ConfirmInstall(
-      NULL,
+      nullptr,
       extension.get(),
       base::Bind(&VerifyPromptPermissionsCallback,
                  run_loop.QuitClosure(),
                  2u,  // |regular_permissions_count|.
                  1u));  // |withheld_permissions_count|.
   run_loop.Run();
 }
 
+TEST(ExtensionInstallPromptUnittest, DelegatedPromptShowsOptionalPermissions) {
+  content::TestBrowserThreadBundle thread_bundle;
+  ListBuilder required_permissions;
+  required_permissions.Append("tabs");
+  ListBuilder optional_permissions;
+  optional_permissions.Append("location");

[not at google - send to devlin, 2015/03/03 17:33:26]

Could you inline all of these (I don't know why the previous test doesn't)? The
point of ListBuilder is to inline things.

[Marc Treib, 2015/03/04 10:33:43]

Done, also in the previous test.

+  scoped_refptr<const Extension> extension =
+      ExtensionBuilder().SetManifest(
+          DictionaryBuilder().Set("name", "foo")
+                             .Set("version", "1.0")
+                             .Set("manifest_version", 2)
+                             .Set("description", "Random Ext")
+                             .Set("permissions", required_permissions)

[not at google - send to devlin, 2015/03/03 17:33:26]

E.g.


.Set("permissions",
     ListBuilder().Append("tabs"))
.Set("optional_permissions",
     ListBuilder().Append("location"))

[Marc Treib, 2015/03/04 10:33:43]

Done.

+                             .Set("optional_permissions",
+                                  optional_permissions)).Build();
+  ExtensionInstallPrompt prompt(nullptr /* no web contents in this test */);
+  base::RunLoop run_loop;
+  prompt.set_callback_for_test(
+      base::Bind(&VerifyPromptPermissionsCallback,
+                 run_loop.QuitClosure(),
+                 2u,  // |regular_permissions_count|.
+                 0u));  // |withheld_permissions_count|.
+  prompt.ConfirmPermissionsForDelegatedInstall(nullptr,  // no delegate
+                                               extension.get(),
+                                               "Username",
+                                               nullptr);  // no icon
+  run_loop.Run();
+}
+
 }  // namespace extensions