Revert "MacPWAs: Reparent tabs when installing PWAs"

This reverts commit 96b864cc836925ac0756772dcf1d7435205767c6.

Reason for revert: This sometimes results in mangled .app bundles, needs a cleaner solution.

Original change's description:
> 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: 915571
> Change-Id: Ifaf507525729a9a168e821f722aee03e9f6dd8f4
> Reviewed-on: https://chromium-review.googlesource.com/c/1438037
> Reviewed-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}

TBR=benwells@chromium.org, ccameron@chromium.org, dominickn@chromium.org


(cherry picked from commit 2f3e91514eedb892cde115b7a0dffa75c3b6dc69)

Bug: 859152
Change-Id: I6460da08a6dfb8f3e68218ecc19216773062458a
Reviewed-on: https://chromium-review.googlesource.com/c/1450216
Reviewed-by: ccameron <ccameron@chromium.org>
Commit-Queue: ccameron <ccameron@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#628465}
Reviewed-on: https://chromium-review.googlesource.com/c/1450446
Cr-Commit-Position: refs/branch-heads/3683@{#137}
Cr-Branched-From: e51029943e0a38dd794b73caaf6373d5496ae783-refs/heads/master@{#625896}
diff --git a/chrome/browser/extensions/bookmark_app_helper.cc b/chrome/browser/extensions/bookmark_app_helper.cc
index d13ce386..bffd882 100644
--- a/chrome/browser/extensions/bookmark_app_helper.cc
+++ b/chrome/browser/extensions/bookmark_app_helper.cc
@@ -530,7 +530,6 @@
     }
 #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,6 +537,7 @@
       launch_type == LAUNCH_TYPE_WINDOW && !profile_->IsOffTheRecord()) {
     ReparentWebContentsIntoAppBrowser(contents_, extension);
   }
+#endif  // !defined(OS_MACOSX)
 
   callback_.Run(extension, web_app_info_);
 }
diff --git a/chrome/browser/extensions/bookmark_app_helper_browsertest.cc b/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
index 6428014..debe2c5 100644
--- a/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
+++ b/chrome/browser/extensions/bookmark_app_helper_browsertest.cc
@@ -183,10 +183,12 @@
                                           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