Extensions: Switch to new permission message system, part III

chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.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 "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_icon_manager.h"
 #include "chrome/browser/extensions/extension_install_prompt.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
 #include "chrome/common/extensions/extension_test_util.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/permissions/permission_message_provider.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/test_util.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
+using extensions::PermissionMessageString;
+using extensions::PermissionMessageStrings;
+
 // A simple delegate implementation that counts the number of times
 // |InstallUIProceed| and |InstallUIAbort| are called.
 class MockExtensionInstallPromptDelegate
     : public ExtensionInstallPrompt::Delegate {
  public:
   MockExtensionInstallPromptDelegate()
       : proceed_count_(0),
         abort_count_(0) {}
 
   // ExtensionInstallPrompt::Delegate overrides.
@@ skipping 39 matching lines @@
   explicit ExtensionInstallDialogViewTestBase(
       ExtensionInstallPrompt::PromptType prompt_type);
   ~ExtensionInstallDialogViewTestBase() override {}
 
   void SetUpOnMainThread() override;
 
   ExtensionInstallPrompt::Prompt* prompt() { return prompt_.get(); }
   content::WebContents* web_contents() { return web_contents_; }
   MockExtensionInstallPromptDelegate* delegate() { return &delegate_; }
 
-  void SetPromptPermissions(std::vector<base::string16> permissions);
-  void SetPromptDetails(std::vector<base::string16> details);
+  void SetPromptPermissions(const PermissionMessageStrings& permissions);
   void SetPromptRetainedFiles(std::vector<base::FilePath> files);
 
  private:
   const extensions::Extension* extension_;
   MockExtensionInstallPrompt* install_prompt_;
   scoped_refptr<ExtensionInstallPrompt::Prompt> prompt_;
   content::WebContents* web_contents_;
   MockExtensionInstallPromptDelegate delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionInstallDialogViewTestBase);
@@ skipping 17 matching lines @@
 
   install_prompt_ = new MockExtensionInstallPrompt(web_contents_);
   install_prompt_->set_prompt(prompt_.get());
   prompt_->set_extension(extension_);
 
   scoped_ptr<ExtensionIconManager> icon_manager(new ExtensionIconManager());
   const SkBitmap icon_bitmap = icon_manager->GetIcon(extension_->id());
   gfx::Image icon = gfx::Image::CreateFrom1xBitmap(icon_bitmap);
   prompt_->set_icon(icon);
 
-  this->SetPromptPermissions(std::vector<base::string16>());
-  this->SetPromptDetails(std::vector<base::string16>());
+  this->SetPromptPermissions(PermissionMessageStrings());
   this->SetPromptRetainedFiles(std::vector<base::FilePath>());
 }
 
 void ExtensionInstallDialogViewTestBase::SetPromptPermissions(
-    std::vector<base::string16> permissions) {
+    const PermissionMessageStrings& permissions) {
   prompt_->SetPermissions(permissions,
                           ExtensionInstallPrompt::REGULAR_PERMISSIONS);
 }
 
-void ExtensionInstallDialogViewTestBase::SetPromptDetails(
-    std::vector<base::string16> details) {
-  prompt_->SetPermissionsDetails(details,
-                                 ExtensionInstallPrompt::REGULAR_PERMISSIONS);
-}
-
 void ExtensionInstallDialogViewTestBase::SetPromptRetainedFiles(
     std::vector<base::FilePath> files) {
   prompt_->set_retained_files(files);
 }
 
 class ScrollbarTest : public ExtensionInstallDialogViewTestBase {
  protected:
   ScrollbarTest();
   ~ScrollbarTest() override {}
 
@@ skipping 22 matching lines @@
   content::RunAllBlockingPoolTasksUntilIdle();
 
   // Check if the vertical scrollbar is visible.
   return dialog->scroll_view()->vertical_scroll_bar()->visible();
 }
 
 // Tests that a scrollbar _is_ shown for an excessively long extension
 // install prompt.
 IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) {
   base::string16 permission_string(base::ASCIIToUTF16("Test"));
-  std::vector<base::string16> permissions;
-  std::vector<base::string16> details;
-  for (int i = 0; i < 20; i++) {
-    permissions.push_back(permission_string);
-    details.push_back(base::string16());
-  }
+  PermissionMessageStrings permissions;
+  for (int i = 0; i < 20; i++)
+    permissions.push_back(PermissionMessageString(permission_string));
   this->SetPromptPermissions(permissions);
-  this->SetPromptDetails(details);
   ASSERT_TRUE(IsScrollbarVisible()) << "Scrollbar is not visible";
 }
 
 // Tests that a scrollbar isn't shown for this regression case.
 // See crbug.com/385570 for details.
 IN_PROC_BROWSER_TEST_F(ScrollbarTest, ScrollbarRegression) {
   base::string16 permission_string(base::ASCIIToUTF16(
       "Read and modify your data on *.facebook.com"));
-  std::vector<base::string16> permissions;
-  permissions.push_back(permission_string);
+  PermissionMessageStrings permissions;
+  permissions.push_back(PermissionMessageString(permission_string));
   this->SetPromptPermissions(permissions);
-  std::vector<base::string16> details;
-  details.push_back(base::string16());
-  this->SetPromptDetails(details);
   ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible";
 }
 
 class ExtensionInstallDialogViewTest
     : public ExtensionInstallDialogViewTestBase {
  protected:
   ExtensionInstallDialogViewTest()
       : ExtensionInstallDialogViewTestBase(
             ExtensionInstallPrompt::INSTALL_PROMPT) {}
   ~ExtensionInstallDialogViewTest() override {}
@@ skipping 43 matching lines @@
     MockExtensionInstallPromptDelegate delegate;
     scoped_ptr<ExtensionInstallDialogView> dialog(
         new ExtensionInstallDialogView(
             profile(), web_contents(), &delegate, prompt()));
     dialog.reset();
 
     EXPECT_EQ(1, delegate.abort_count());
     EXPECT_EQ(0, delegate.proceed_count());
   }
 }