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

chrome/test/base/chrome_test_launcher.cc

 // 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.
 
 #include "content/test/test_launcher.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/scoped_temp_dir.h"
 #include "base/test/test_file_util.h"
@@ skipping 20 matching lines @@
   virtual ~ChromeTestLauncherDelegate() {
   }
 
   virtual void EarlyInitialize() OVERRIDE {
 #if defined(OS_MACOSX)
     chrome_browser_application_mac::RegisterBrowserCrApp();
 #endif
   }
 
   virtual bool Run(int argc, char** argv, int* return_code) OVERRIDE {
+#if defined(OS_WIN) || defined(OS_LINUX)
+    CommandLine* command_line = CommandLine::ForCurrentProcess();
+    bool launch_chrome =
+        command_line->HasSwitch(switches::kProcessType) ||
+        command_line->HasSwitch(ChromeTestSuite::kLaunchAsBrowser);
+#endif
 #if defined(OS_WIN)
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(switches::kProcessType)) {
+    if (launch_chrome) {
       sandbox::SandboxInterfaceInfo sandbox_info = {0};
       content::InitializeSandboxInfo(&sandbox_info);
       ChromeMainDelegate chrome_main_delegate;
       *return_code = content::ContentMain(GetModuleHandle(NULL),
                                           &sandbox_info,
                                           &chrome_main_delegate);
       return true;
     }
 #elif defined(OS_LINUX)
-    CommandLine* command_line = CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(switches::kProcessType)) {
+    if (launch_chrome) {
       ChromeMainDelegate chrome_main_delegate;
       *return_code = content::ContentMain(argc,
                                           const_cast<const char**>(argv),
                                           &chrome_main_delegate);
       return true;
     }
 #endif  // defined(OS_WIN)
 
     return false;
   }
@@ skipping 40 matching lines @@
  private:
   ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeTestLauncherDelegate);
 };
 
 int main(int argc, char** argv) {
   ChromeTestLauncherDelegate launcher_delegate;
   return test_launcher::LaunchTests(&launcher_delegate, argc, argv);
 }