Support Chromium-branded builds and cleanup reference build usage.

chrome/test/memory_test/memory_test.cc

 // Copyright (c) 2011 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 "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/process_util.h"
@@ skipping 23 matching lines @@
 
   ~MemoryTest() {
     // Cleanup our temporary directory.
     if (cleanup_temp_dir_on_exit_)
       file_util::Delete(temp_dir_, true);
   }
 
   // Called from SetUp() to determine the user data dir to copy.
   virtual FilePath GetUserDataDirSource() const = 0;
 
-  // Called from Setup() to find the path for the chrome executable.
-  // An empty FilePath results in the default being used.
-  virtual FilePath GetBrowserDirectory() const { return FilePath(); }
-
   // Called from RunTest() to determine the set of URLs to retrieve.
   // Returns the length of the list.
   virtual size_t GetUrlList(std::string** list) = 0;
 
-  static FilePath GetReferenceBrowserDirectory() {
-    FilePath dir;
-    PathService::Get(chrome::DIR_TEST_TOOLS, &dir);
-    dir = dir.AppendASCII("reference_build");
-#if defined(OS_WIN)
-    dir = dir.AppendASCII("chrome");
-#elif defined(OS_LINUX)
-    dir = dir.AppendASCII("chrome_linux");
-#elif defined(OS_MACOSX)
-    dir = dir.AppendASCII("chrome_mac");
-#endif
-    return dir;
-  }
-
   virtual void SetUp() {
     show_window_ = true;
 
     // For now, turn off plugins because they crash like crazy.
     // TODO(mbelshe): Fix Chrome to not crash with plugins.
     launch_arguments_.AppendSwitch(switches::kDisablePlugins);
 
     launch_arguments_.AppendSwitch(switches::kEnableLogging);
 
     // In order to record a dataset to cache for future playback,
@@ skipping 22 matching lines @@
           LOG(ERROR) << "Error preparing temp directory for test";
         }
       }
     } else {  // Record session.
       launch_arguments_.AppendSwitch(switches::kRecordMode);
       launch_arguments_.AppendSwitch(switches::kNoEvents);
 
       user_data_dir_ = GetUserDataDirSource();
     }
 
-    FilePath browser_dir = GetBrowserDirectory();
-    if (!browser_dir.empty()) {
-#if defined(OS_WIN)
-      browser_dir = browser_dir.AppendASCII("chrome");
-#elif defined(OS_LINUX)
-      browser_dir = browser_dir.AppendASCII("chrome_linux");
-#elif defined(OS_MACOSX)
-      browser_dir = browser_dir.AppendASCII("chrome_mac");
-#endif
-      browser_directory_ = browser_dir;
-    }
-
     launch_arguments_.AppendSwitchPath(switches::kUserDataDir, user_data_dir_);
     UITest::SetUp();
   }
 
   // This memory test loads a set of URLs across a set of tabs, maintaining the
   // number of concurrent open tabs at num_target_tabs.
   // <NEWTAB> is a special URL which informs the loop when we should create a
   // new tab.
   // <PAUSE> is a special URL that informs the loop to pause before proceeding
   // to the next URL.
   void RunTest(const char* test_name, int num_target_tabs) {
+    std::cout<<"\nRunning test: "<<test_name<<"\n";
     std::string* urls;
     size_t urls_length = GetUrlList(&urls);
 
     // Record the initial CommitCharge.  This is a system-wide measurement,
     // so if other applications are running, they can create variance in this
     // test.
     size_t start_size = base::GetSystemCommitCharge();
 
     // Cycle through the URLs.
     scoped_refptr<BrowserProxy> window(automation()->GetBrowserWindow(0));
@@ skipping 275 matching lines @@
   "http://pt.wikipedia.org/wiki/P%C3%A1gina_principal",
   "http://es.wikipedia.org/wiki/Portada",
   "http://ru.wikipedia.org/wiki/%D0%97%D0%B0%D0%B3%D0%BB%D0%B0%D0%B2%D0%BD%D0%B0%D1%8F_%D1%81%D1%82%D1%80%D0%B0%D0%BD%D0%B8%D1%86%D0%B0",
   "<NEWTAB>",
   "http://www.google.com/translate_t?hl=en&text=This%20Is%20A%20Test%20Of%20missspellingsdfdf&sl=en&tl=ja"
 };
 
 size_t GeneralMixMemoryTest::urls_length_ =
     arraysize(GeneralMixMemoryTest::urls_);
 
-class GenerlMixReferenceMemoryTest : public GeneralMixMemoryTest {
+class GeneralMixReferenceMemoryTest : public GeneralMixMemoryTest {
  public:
-  virtual FilePath GetBrowserDirectory() const {
-    return GetReferenceBrowserDirectory();
+  void SetUp() {
+    UseReferenceBuild();
+    GeneralMixMemoryTest::SetUp();
   }
 };
 
 class MembusterMemoryTest : public MemoryTest {
  public:
   MembusterMemoryTest() : test_urls_(NULL) {}
 
   virtual ~MembusterMemoryTest() {
     delete[] test_urls_;
   }
@@ skipping 72 matching lines @@
   "http://en.marveldatabase.com/Main_Page",
   "http://bioshock.wikia.com/wiki/Main_Page",
   "http://www.armchairgm.com/Special:ImageRating",
   "http://www.armchairgm.com/Anderson_Continues_to_Thrive_for_Cleveland",
   "http://www.armchairgm.com/Main_Page"
 };
 
 size_t MembusterMemoryTest::urls_length_ =
     arraysize(MembusterMemoryTest::source_urls_);
 
-TEST_F(GeneralMixMemoryTest, SingleTabTest) {
-  RunTest("_1t", 1);
+#define QUOTE(x) #x
+#define GENERAL_MIX_MEMORY_TESTS(name, tabs) \
+TEST_F(GeneralMixMemoryTest, name) { \
+  RunTest(QUOTE(_##tabs##t), tabs); \
+} \
+TEST_F(GeneralMixReferenceMemoryTest, name) { \
+  RunTest(QUOTE(_##tabs##t_ref), tabs); \
 }
 
-TEST_F(GeneralMixMemoryTest, FiveTabTest) {
-  RunTest("_5t", 5);
-}
-
-TEST_F(GeneralMixMemoryTest, TwelveTabTest) {
-  RunTest("_12t", 12);
-}
+GENERAL_MIX_MEMORY_TESTS(SingleTabTest, 1);
+GENERAL_MIX_MEMORY_TESTS(FiveTabTest, 5);
+GENERAL_MIX_MEMORY_TESTS(TwelveTabTest, 12);

[jrt, 2011/06/17 19:50:46]

This test did not previously use a reference build, although the code existed.
Should I add a reference build test like so?

 
 // Commented out until the recorded cache data is added.
 //TEST_F(MembusterMemoryTest, Windows) {
 //  RunTest("membuster", 0);
 //}
 
 }  // namespace