Make the empty browser_test work again after incremental linking broke it.

content/test/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/public/test/test_launcher.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 35 matching lines @@
 // The environment variable name for the test shard index.
 const char kTestShardIndex[] = "GTEST_SHARD_INDEX";
 
 // The default output file for XML output.
 const FilePath::CharType kDefaultOutputFile[] = FILE_PATH_LITERAL(
     "test_detail.xml");
 
 // Quit test execution after this number of tests has timed out.
 const int kMaxTimeouts = 5;  // 45s timeout * (5 + 1) = 270s max run time.
 
 const char kEmptyTestName[] = "InProcessBrowserTest.Empty";

[mmenke, 2012/06/29 20:11:58]

Kinda weird to still have this here, though getting rid of it again would
probably be a bit of a pain.

 
 namespace {
 
-#if defined(IN_PROC_BROWSER_TEST_F)
-// An empty test (it starts up and shuts down the browser as part of its
-// setup and teardown) used to prefetch all of the browser code into memory.
-IN_PROC_BROWSER_TEST_F(InProcessBrowserTest, Empty) {
-}
-#endif
-
 // Parses the environment variable var as an Int32.  If it is unset, returns
 // default_val.  If it is set, unsets it then converts it to Int32 before
 // returning it.  If unsetting or converting to an Int32 fails, print an
 // error and exit with failure.
 int32 Int32FromEnvOrDie(const char* const var, int32 default_val) {
   scoped_ptr<base::Environment> env(base::Environment::Create());
   std::string str_val;
   int32 result;
   if (!env->GetVar(var, &str_val))
     return default_val;
@@ skipping 585 matching lines @@
     }
 
     // Special value "-1" means "repeat indefinitely".
     if (cycles != -1)
       cycles--;
   }
   return exit_code;
 }
 
 }  // namespace test_launcher