Mac: Let browser_tests run in bundled mode for their whole lifetime.

chrome/test/in_process_browser_test.h

 // Copyright (c) 2010 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_IN_PROCESS_BROWSER_TEST_H_
 #define CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_
 #pragma once
 
 #include "base/compiler_specific.h"
 #include "base/ref_counted.h"
@@ skipping 92 matching lines @@
   virtual void TearDownInProcessBrowserTestFixture() {}
 
   // Override this to add command line flags specific to your test.
   virtual void SetUpCommandLine(CommandLine* command_line) {}
 
   // Override this to add any custom cleanup code that needs to be done on the
   // main thread before the browser is torn down.
   virtual void CleanUpOnMainThread() {}
 
   // Returns the testing server. Guaranteed to be non-NULL.
-  net::TestServer* test_server() { return &test_server_; }
+  net::TestServer* test_server() { return test_server_.get(); }
 
   // Creates a browser with a single tab (about:blank), waits for the tab to
   // finish loading and shows the browser.
   //
   // This is invoked from Setup.
   virtual Browser* CreateBrowser(Profile* profile);
 
   // Creates a browser for a popup window with a single tab (about:blank), waits
   // for the tab to finish loading, and shows the browser.
   Browser* CreateBrowserForPopup(Profile* profile);
@@ skipping 22 matching lines @@
   // (RunTestOnMainThread), quits the browsers and returns.
   void RunTestOnMainThreadLoop();
 
   // Quits all open browsers and waits until there are no more browsers.
   void QuitBrowsers();
 
   // Browser created from CreateBrowser.
   Browser* browser_;
 
   // Testing server, started on demand.
-  net::TestServer test_server_;
+  scoped_ptr<net::TestServer> test_server_;
 
   // Whether this test requires the browser windows to be shown (interactive
   // tests for example need the windows shown).
   bool show_window_;
 
   // Whether the JavaScript can access the DOMAutomationController (a JS object
   // that can send messages back to the browser).
   bool dom_automation_enabled_;
 
   // Whether this test requires the TabCloseableStateWatcher.
@@ skipping 47 matching lines @@
             GTEST_TEST_CLASS_NAME_(test_case_name, test_name)>);\
 void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::RunTestOnMainThread()
 
 #define IN_PROC_BROWSER_TEST_F(test_fixture, test_name)\
   IN_PROC_BROWSER_TEST_(test_fixture, test_name, test_fixture,\
                     ::testing::internal::GetTypeId<test_fixture>())
 
 #endif  // defined(ALLOW_IN_PROC_BROWSER_TEST)
 
 #endif  // CHROME_TEST_IN_PROCESS_BROWSER_TEST_H_