Convert the session restore ui_tests to browser_tests. I renabled the disabled tests; hopefully the…

chrome/test/base/in_process_browser_test.h

 // 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.
 
 #ifndef CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 142 matching lines @@
   Browser* CreateBrowserForPopup(Profile* profile);
 
   // Creates a browser for an application and waits for it to load and shows
   // the browser.
   Browser* CreateBrowserForApp(const std::string& app_name, Profile* profile);
 
   // Called from the various CreateBrowser methods to add a blank tab, wait for
   // the navigation to complete, and show the browser's window.
   void AddBlankTabAndShow(Browser* browser);
 
+#if !defined OS_MACOSX
+  // Return a CommandLine object  that is used to relaunch the browser_test binary
+  // as a browser process. This function is deliberately not defined on the Mac
+  // because re-using an existing browser process when launching from the command
+  // line isn't a concept that we support on the Mac; AppleEvents are the Mac
+  // solution for the same need. Any test based on these functions doesn't apply
+  // to the Mac.
+  CommandLine GetCommandLineForRelaunch();
+#endif
+
   // Returns the host resolver being used for the tests. Subclasses might want
   // to configure it inside tests.
   net::RuleBasedHostResolverProc* host_resolver() {
     return host_resolver_.get();
   }
 
   // Sets some test states (see below for comments).  Call this in your test
   // constructor.
   void set_show_window(bool show) { show_window_ = show; }
   void set_initial_window_required(bool flag) {
@@ skipping 67 matching lines @@
 #if defined(OS_CHROMEOS)
   chromeos::ScopedStubCrosEnabler stub_cros_enabler_;
 #endif  // defined(OS_CHROMEOS)
 
 #if defined(OS_MACOSX)
   base::mac::ScopedNSAutoreleasePool* autorelease_pool_;
 #endif  // OS_MACOSX
 };
 
 #endif  // CHROME_TEST_BASE_IN_PROCESS_BROWSER_TEST_H_