Making the browser tests work on Unix

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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 "chrome/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
+#include "chrome/browser/browser_window.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/renderer_host/render_process_host.h"
+#if defined(OS_WIN)
 #include "chrome/browser/views/frame/browser_view.h"
+#endif
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/main_function_params.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/ui_test_utils.h"
 #include "net/base/host_resolver_unittest.h"
-#include "sandbox/src/sandbox_factory.h"
 #include "sandbox/src/dep.h"
 
 extern int BrowserMain(const MainFunctionParams&);
 
 const wchar_t kUnitTestShowWindows[] = L"show-windows";
 
 namespace {
 
 bool DieFileDie(const std::wstring& file, bool recurse) {
   if (!file_util::PathExists(file))
@@ skipping 35 matching lines @@
   // Don't delete the resources when BrowserMain returns. Many ui classes
   // cache SkBitmaps in a static field so that if we delete the resource
   // bundle we'll crash.
   browser_shutdown::delete_resources_on_shutdown = false;
 
   CommandLine* command_line = CommandLine::ForCurrentProcessMutable();
   original_command_line_.reset(new CommandLine(*command_line));
 
   SetUpCommandLine(command_line);
 
+#if defined(OS_WIN)
   // Hide windows on show.
   if (!command_line->HasSwitch(kUnitTestShowWindows) && !show_window_)
     BrowserView::SetShowState(SW_HIDE);
+#endif
 
   if (dom_automation_enabled_)
     command_line->AppendSwitch(switches::kDomAutomationController);
 
   if (single_process_)
     command_line->AppendSwitch(switches::kSingleProcess);
 
   command_line->AppendSwitchWithValue(switches::kUserDataDir, user_data_dir);
 
   // For some reason the sandbox wasn't happy running in test mode. These
@@ skipping 10 matching lines @@
   // otherwise they'll try to use unit_test.exe.
   std::wstring subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
   FilePath fp_subprocess_path = FilePath::FromWStringHack(subprocess_path);
   subprocess_path = fp_subprocess_path.DirName().ToWStringHack();
   file_util::AppendToPath(&subprocess_path,
                           chrome::kBrowserProcessExecutablePath);
   command_line->AppendSwitchWithValue(switches::kBrowserSubprocessPath,
                                       subprocess_path);
 
-  sandbox::SandboxInterfaceInfo sandbox_info = {0};
   SandboxInitWrapper sandbox_wrapper;
   MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
   params.ui_task =
       NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
 
   scoped_refptr<net::RuleBasedHostMapper> host_mapper(
       new net::RuleBasedHostMapper());
   ConfigureHostMapper(host_mapper.get());
   net::ScopedHostMapper scoped_host_mapper(host_mapper.get());
   BrowserMain(params);
 }
 
 void InProcessBrowserTest::TearDown() {
   // Reinstall testing browser process.
   delete g_browser_process;
   g_browser_process = new TestingBrowserProcess();
 
   browser_shutdown::delete_resources_on_shutdown = true;
 
+#if defined(WIN)
   BrowserView::SetShowState(-1);
+#endif
 
   *CommandLine::ForCurrentProcessMutable() = *original_command_line_;
   RenderProcessHost::set_run_renderer_in_process(original_single_process_);
 }
 
 void InProcessBrowserTest::Observe(NotificationType type,
                                    const NotificationSource& source,
                                    const NotificationDetails& details) {
   if (type == NotificationType::BROWSER_CLOSED) {
     DCHECK(Source<Browser>(source).ptr() == browser_);
@@ skipping 67 matching lines @@
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::ConfigureHostMapper(
     net::RuleBasedHostMapper* host_mapper) {
   host_mapper->AllowDirectLookup("*.google.com");
   // See http://en.wikipedia.org/wiki/Web_Proxy_Autodiscovery_Protocol
   // We don't want the test code to use it.
   host_mapper->AddSimulatedFailure("wpad");
 }