Use BookmarkAppConfirmationView on Mac. Delete the NSAlert Mac uses currently.

chrome/browser/extensions/bookmark_app_helper_unittest.cc

Index: chrome/browser/extensions/bookmark_app_helper_unittest.cc
diff --git a/chrome/browser/extensions/bookmark_app_helper_unittest.cc b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
index 7294811c7a4e38d1781006be8fc248e4a1e8279d..78dea8d41225ed46a3e4ee8c3fe0abee6051ca55 100644
--- a/chrome/browser/extensions/bookmark_app_helper_unittest.cc
+++ b/chrome/browser/extensions/bookmark_app_helper_unittest.cc
@@ -9,6 +9,7 @@
 #include "chrome/browser/banners/app_banner_settings_helper.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
+#include "chrome/browser/extensions/test_bookmark_app_helper.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/render_process_host.h"
@@ -277,16 +278,14 @@ void TestIconGeneration(int icon_size,
                                             expected_resized);
 }
 
-}  // namespace
-
-class TestBookmarkAppHelper : public BookmarkAppHelper {
+class TestBookmarkAppHelperImpl : public test::TestBookmarkAppHelper {
  public:
-  TestBookmarkAppHelper(ExtensionService* service,
-                        WebApplicationInfo web_app_info,
-                        content::WebContents* contents)
-      : BookmarkAppHelper(service->profile(), web_app_info, contents) {}
+  TestBookmarkAppHelperImpl(ExtensionService* service,
+                            WebApplicationInfo web_app_info,
+                            content::WebContents* contents)
+      : TestBookmarkAppHelper(service->profile(), web_app_info, contents) {}
 
-  ~TestBookmarkAppHelper() override {}
+  ~TestBookmarkAppHelperImpl() override {}
 
   void CreationComplete(const extensions::Extension* extension,
                         const WebApplicationInfo& web_app_info) {
@@ -294,13 +293,13 @@ class TestBookmarkAppHelper : public BookmarkAppHelper {
   }
 
   void CompleteGetManifest(const content::Manifest& manifest) {
-    BookmarkAppHelper::OnDidGetManifest(GURL(), manifest);
+    TestBookmarkAppHelper::OnDidGetManifest(GURL(), manifest);
   }
 
   void CompleteIconDownload(
       bool success,
       const std::map<GURL, std::vector<SkBitmap> >& bitmaps) {
-    BookmarkAppHelper::OnIconsDownloaded(success, bitmaps);
+    TestBookmarkAppHelper::OnIconsDownloaded(success, bitmaps);
   }
 
   const Extension* extension() { return extension_; }
@@ -308,9 +307,11 @@ class TestBookmarkAppHelper : public BookmarkAppHelper {
  private:
   const Extension* extension_;
 
-  DISALLOW_COPY_AND_ASSIGN(TestBookmarkAppHelper);
+  DISALLOW_COPY_AND_ASSIGN(TestBookmarkAppHelperImpl);
 };
 
+}  // namespace
+
 TEST_F(BookmarkAppHelperExtensionServiceTest, CreateBookmarkApp) {
   WebApplicationInfo web_app_info;
   web_app_info.app_url = GURL(kAppUrl);
@@ -319,8 +320,8 @@ TEST_F(BookmarkAppHelperExtensionServiceTest, CreateBookmarkApp) {
 
   std::unique_ptr<content::WebContents> contents(
       content::WebContentsTester::CreateTestWebContents(profile(), nullptr));
-  TestBookmarkAppHelper helper(service_, web_app_info, contents.get());
-  helper.Create(base::Bind(&TestBookmarkAppHelper::CreationComplete,
+  TestBookmarkAppHelperImpl helper(service_, web_app_info, contents.get());
+  helper.Create(base::Bind(&TestBookmarkAppHelperImpl::CreationComplete,
                            base::Unretained(&helper)));
 
   std::map<GURL, std::vector<SkBitmap> > icon_map;
@@ -353,8 +354,8 @@ TEST_F(BookmarkAppHelperExtensionServiceTest, CreateBookmarkAppWithManifest) {
 
   std::unique_ptr<content::WebContents> contents(
       content::WebContentsTester::CreateTestWebContents(profile(), nullptr));
-  TestBookmarkAppHelper helper(service_, web_app_info, contents.get());
-  helper.Create(base::Bind(&TestBookmarkAppHelper::CreationComplete,
+  TestBookmarkAppHelperImpl helper(service_, web_app_info, contents.get());
+  helper.Create(base::Bind(&TestBookmarkAppHelperImpl::CreationComplete,
                            base::Unretained(&helper)));
 
   content::Manifest manifest;
@@ -389,8 +390,8 @@ TEST_F(BookmarkAppHelperExtensionServiceTest, CreateBookmarkAppNoContents) {
   web_app_info.icons.push_back(
       CreateIconInfoWithBitmap(kIconSizeTiny, SK_ColorRED));
 
-  TestBookmarkAppHelper helper(service_, web_app_info, NULL);
-  helper.Create(base::Bind(&TestBookmarkAppHelper::CreationComplete,
+  TestBookmarkAppHelperImpl helper(service_, web_app_info, NULL);
+  helper.Create(base::Bind(&TestBookmarkAppHelperImpl::CreationComplete,
                            base::Unretained(&helper)));
 
   content::RunAllBlockingPoolTasksUntilIdle();