Fix SetUp of HostedAppTest and AppShimMenuControllerBrowserTest

chrome/browser/ui/extensions/hosted_app_browsertest.cc

 // Copyright 2015 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 <string>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_feature_list.h"
@@ skipping 42 matching lines @@
 
 }  // namespace
 
 class HostedAppTest : public ExtensionBrowserTest {
  public:
   HostedAppTest() : app_browser_(nullptr) {}
   ~HostedAppTest() override {}
 
   // testing::Test:
   void SetUp() override {
-    ExtensionBrowserTest::SetUp();
 #if defined(OS_MACOSX)
     scoped_feature_list_.InitAndEnableFeature(features::kBookmarkApps);
 #endif
+    ExtensionBrowserTest::SetUp();
   }
 
  protected:
   void SetupApp(const std::string& app_folder, bool is_bookmark_app) {
     SetupApp(test_data_dir_.AppendASCII(app_folder), is_bookmark_app);
   }
 
   void SetupApp(const base::FilePath& app_folder, bool is_bookmark_app) {
     const Extension* app = InstallExtensionWithSourceAndFlags(
         app_folder, 1, extensions::Manifest::INTERNAL,
@@ skipping 265 matching lines @@
   } else {
     // TODO(lukasza): https://crbug.com/718516: Process policy is not
     // well-defined / settled wrt relationship between 1) hosted apps and 2)
     // same-site web content outside of hosted app's extent.  When this test was
     // authored --site-per-process would put |app| in a separate renderer
     // process from |diff_dir| and |same_site|, even though such process
     // placement can be problematic (if |app| tries to synchronously script
     // |diff_dir| and/or |same_site|).
   }
 }