Extensions: Switch to new permission message system, part III

chrome/browser/ui/cocoa/extensions/extension_install_view_controller_unittest.mm

 // Copyright (c) 2012 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.
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #import "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h"
 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/permissions/permission_message_provider.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #import "testing/gtest_mac.h"
 
 using extensions::Extension;
+using extensions::PermissionMessageString;
+using extensions::PermissionMessageStrings;
 
 // Base class for our tests.
 class ExtensionInstallViewControllerTest : public CocoaProfileTest {
  public:
   ExtensionInstallViewControllerTest() {
     extension_ = chrome::LoadInstallPromptExtension();
   }
 
  protected:
   scoped_refptr<extensions::Extension> extension_;
 };
 
 // Test that we can load the two kinds of prompts correctly, that the outlets
 // are hooked up, and that the dialog calls cancel when cancel is pressed.
 TEST_F(ExtensionInstallViewControllerTest, BasicsNormalCancel) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
-  std::vector<base::string16> permissions;
-  permissions.push_back(base::UTF8ToUTF16("warning 1"));
+  PermissionMessageStrings permissions;
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 1")));
   prompt->SetPermissions(permissions, type);
-  // No details provided with this permission.
-  std::vector<base::string16> details;
-  details.push_back(base::string16());
-  prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
       [[ExtensionInstallViewController alloc] initWithProfile:profile()
                                                     navigator:browser()
                                                      delegate:&delegate
                                                        prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   // Test the right nib loaded.
@@ skipping 32 matching lines @@
 }
 
 TEST_F(ExtensionInstallViewControllerTest, BasicsNormalOK) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
-  std::vector<base::string16> permissions;
-  permissions.push_back(base::UTF8ToUTF16("warning 1"));
+  PermissionMessageStrings permissions;
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 1")));
   prompt->SetPermissions(permissions, type);
-  // No details provided with this permission.
-  std::vector<base::string16> details;
-  details.push_back(base::string16());
-  prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
       [[ExtensionInstallViewController alloc] initWithProfile:profile()
                                                     navigator:browser()
                                                      delegate:&delegate
                                                        prompt:prompt]);
 
   [controller view];  // Force nib load.
   [controller ok:nil];
 
   EXPECT_EQ(0, delegate.abort_count());
   EXPECT_EQ(1, delegate.proceed_count());
 }
 
 // Test that controls get repositioned when there are two warnings vs one
 // warning.
 TEST_F(ExtensionInstallViewControllerTest, MultipleWarnings) {
   chrome::MockExtensionInstallPromptDelegate delegate1;
   chrome::MockExtensionInstallPromptDelegate delegate2;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> one_warning_prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
-  std::vector<base::string16> permissions;
-  permissions.push_back(base::UTF8ToUTF16("warning 1"));
+  PermissionMessageStrings permissions;
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 1")));
   one_warning_prompt->SetPermissions(permissions, type);
-  // No details provided with this permission.
-  std::vector<base::string16> details;
-  details.push_back(base::string16());
-  one_warning_prompt->SetPermissionsDetails(details, type);
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> two_warnings_prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
-  permissions.push_back(base::UTF8ToUTF16("warning 2"));
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 2")));
   two_warnings_prompt->SetPermissions(permissions, type);
-  // No details provided with this permission.
-  details.push_back(base::string16());
-  two_warnings_prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller1(
       [[ExtensionInstallViewController alloc]
           initWithProfile:profile()
                 navigator:browser()
                  delegate:&delegate1
                    prompt:one_warning_prompt]);
 
   [controller1 view];  // Force nib load.
 
@@ skipping 120 matching lines @@
 }
 
 TEST_F(ExtensionInstallViewControllerTest, PostInstallPermissionsPrompt) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
       chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
-  std::vector<base::string16> permissions;
-  permissions.push_back(base::UTF8ToUTF16("warning 1"));
+  PermissionMessageStrings permissions;
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 1")));
   prompt->SetPermissions(permissions, type);
-  // No details provided with this permission.
-  std::vector<base::string16> details;
-  details.push_back(base::string16());
-  prompt->SetPermissionsDetails(details, type);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
       [[ExtensionInstallViewController alloc] initWithProfile:profile()
                                                     navigator:browser()
                                                      delegate:&delegate
                                                        prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   EXPECT_TRUE([controller cancelButton]);
   EXPECT_FALSE([controller okButton]);
 
   [controller cancel:nil];
   EXPECT_EQ(1, delegate.abort_count());
 }
 
 // Test that permission details show up.
 TEST_F(ExtensionInstallViewControllerTest, PermissionsDetails) {
   chrome::MockExtensionInstallPromptDelegate delegate;
 
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt =
       chrome::BuildExtensionInstallPrompt(extension_.get());
   ExtensionInstallPrompt::PermissionsType type =
       ExtensionInstallPrompt::PermissionsType::REGULAR_PERMISSIONS;
 
-  std::vector<base::string16> permissions;
-  permissions.push_back(base::UTF8ToUTF16("warning 1"));
-  std::vector<base::string16> permissions_details;
-  permissions_details.push_back(base::UTF8ToUTF16("Detail 1"));
+  PermissionMessageStrings permissions;
+  permissions.push_back(
+      PermissionMessageString(base::UTF8ToUTF16("warning 1"),
+                              base::UTF8ToUTF16("Detail 1")));
   prompt->SetPermissions(permissions, type);
-  prompt->SetPermissionsDetails(permissions_details, type);
   prompt->SetIsShowingDetails(
       ExtensionInstallPrompt::PERMISSIONS_DETAILS, 0, true);
 
   base::scoped_nsobject<ExtensionInstallViewController> controller(
       [[ExtensionInstallViewController alloc] initWithProfile:profile()
                                                     navigator:browser()
                                                      delegate:&delegate
                                                        prompt:prompt]);
 
   [controller view];  // Force nib load.
 
   NSOutlineView* outlineView = [controller outlineView];
   EXPECT_TRUE(outlineView);
   EXPECT_EQ(4, [outlineView numberOfRows]);
   EXPECT_NSEQ(base::SysUTF16ToNSString(prompt->GetPermissionsDetails(0, type)),
               [[outlineView dataSource] outlineView:outlineView
                           objectValueForTableColumn:nil
                                              byItem:[outlineView itemAtRow:2]]);
 }