MacPWAs: Reparent tabs when installing PWAs

This works now. When re-parenting the window, the initial attempt to
re-parent the window fails, because the PWA's bundle has not yet
been created. The second attempt then re-creates the bundle and
succeeds. This is a bit kludgey in that it is possible that the bundle
will be recreated twice.

A cleaner solution would be to delay reparenting the contents and
revealing the app in Finder until the app has been created, but that
solution may not be suitable for merge.

Bug: 859152
Change-Id: Ifaf507525729a9a168e821f722aee03e9f6dd8f4
Reviewed-on: https://chromium-review.googlesource.com/c/1438037Reviewed-by: Ben Wells <benwells@chromium.org>
Reviewed-by: Dominick Ng <dominickn@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Commit-Position: refs/heads/master@{#627151}

chrome/browser/extensions/bookmark_app_helper.cc

@@ -531,6 +531,7 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
     }
 #endif  // !defined(OS_CHROMEOS)
   }
+#endif  // !defined(OS_MACOSX)
 
   // Reparent the tab into an app window immediately when opening as a window.
   if (!silent_install &&
@@ -538,7 +539,6 @@ void BookmarkAppHelper::FinishInstallation(const Extension* extension) {
       launch_type == LAUNCH_TYPE_WINDOW && !profile_->IsOffTheRecord()) {
     ReparentWebContentsIntoAppBrowser(contents_, extension);
   }
-#endif  // !defined(OS_MACOSX)
 
   callback_.Run(extension, web_app_info_);
 }

chrome/browser/extensions/bookmark_app_helper_browsertest.cc

@@ -184,12 +184,10 @@ IN_PROC_BROWSER_TEST_F(BookmarkAppHelperTest, CreateWindowedPWAIntoAppWindow) {
                                           bookmark_app_helper_->web_app_info_);
   Wait();  // Quits when the extension install completes.
 
-#if !defined(OS_MACOSX)
   // We do not reparent the tab on OS X.
   Browser* app_browser = chrome::FindBrowserWithWebContents(web_contents());
   EXPECT_TRUE(app_browser->is_app());
   EXPECT_NE(app_browser, browser());
-#endif  // defined(OS_MACOSX)
 }
 
 }  // namespace extensions