Remove InProcessBrowserTest::SetUpOnMainThread() calls.

chrome/browser/app_controller_mac_browsertest.mm

 // Copyright (c) 2012 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.
 
 #import <Carbon/Carbon.h>
 #import <Cocoa/Cocoa.h>
 #import <Foundation/Foundation.h>
 #import <Foundation/NSAppleEventDescriptor.h>
 #import <objc/message.h>
 #import <objc/runtime.h>
@@ skipping 408 matching lines @@
             "PRE_", base::CompareCase::SENSITIVE)) {
       AppControllerOpenShortcutBrowserTest::SetUpInProcessBrowserTestFixture();
     }
   }
 
   void SetUpOnMainThread() override {
     ASSERT_TRUE(embedded_test_server()->Start());
     SessionStartupPref pref(GetParam());
     pref.urls.push_back(GURL(kPresetURL));
     SessionStartupPref::SetStartupPref(browser()->profile(), pref);
-    InProcessBrowserTest::SetUpOnMainThread();
   }
 
  protected:
   void SetUpCommandLine(base::CommandLine* command_line) override {
     set_open_about_blank_on_browser_launch(false);
     // Skip AppControllerOpenShortcutBrowserTest::SetUpCommandLine, which adds
     // startup URL.
     InProcessBrowserTest::SetUpCommandLine(command_line);

[benwells, 2017/06/23 03:10:15]

Nit: may as well remove this while you're here.

[Lei Zhang, 2017/06/27 07:06:04]

I'll do a separate pass for that.

   }
 
   SessionStartupPref::Type GetSessionStartupPref() {
     return session_startup_pref_;
   }
 
  private:
   SessionStartupPref::Type session_startup_pref_;
 
   DISALLOW_COPY_AND_ASSIGN(AppControllerOpenShortcutOnStartupBrowserTest);
@@ skipping 49 matching lines @@
 
  protected:
   SessionStartupPref::Type GetSessionStartupPref() {
     return session_startup_pref_;
   }
 
   void SetUpOnMainThread() override {
     SessionStartupPref pref(session_startup_pref_);
     pref.urls.push_back(GURL(kPresetURL));
     SessionStartupPref::SetStartupPref(browser()->profile(), pref);
-    InProcessBrowserTest::SetUpOnMainThread();
   }
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     set_open_about_blank_on_browser_launch(false);
   }
 
  private:
   SessionStartupPref::Type session_startup_pref_;
 
   DISALLOW_COPY_AND_ASSIGN(AppControllerOpenShortcutInBrowserTest);
@@ skipping 392 matching lines @@
   ui_test_utils::NavigateToURL(browser3, test_url1);
   EXPECT_EQ(g_handoff_url, GURL());
 
   // Activate the original browser window.
   Browser* browser1 = active_browser_list->get(0);
   browser1->window()->Show();
   EXPECT_EQ(g_handoff_url, test_url2);
 }
 
 }  // namespace