Move more files from chrome/test to chrome/test/base, part #7

Move all performance tests under chrome/test/perf.
This also gets rid of directories containing only 1-2 files.

BUG=90905
Review URL: http://codereview.chromium.org/7578004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95481 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 0 insertions, 512 deletions

diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
deleted file mode 100644
index 4f18d50..0000000
--- a/chrome/test/memory_test/memory_test.cc
+++ /dev/null
@@ -1,512 +0,0 @@
-// 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"
-#include "base/string_util.h"
-#include "base/threading/platform_thread.h"
-#include "chrome/browser/net/url_fixer_upper.h"
-#include "chrome/common/chrome_constants.h"
-#include "chrome/common/chrome_paths.h"
-#include "chrome/common/chrome_switches.h"
-#include "chrome/test/automation/automation_proxy.h"
-#include "chrome/test/automation/browser_proxy.h"
-#include "chrome/test/automation/tab_proxy.h"
-#include "chrome/test/automation/window_proxy.h"
-#include "chrome/test/base/chrome_process_util.h"
-#include "chrome/test/ui/ui_perf_test.h"
-#include "googleurl/src/gurl.h"
-#include "net/base/net_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-
-static const FilePath::CharType kTempDirName[] =
-    FILE_PATH_LITERAL("memory_test_profile");
-
-class MemoryTest : public UIPerfTest {
- public:
-  MemoryTest() : cleanup_temp_dir_on_exit_(false) {}
-
-  ~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 RunTest() to determine the set of URLs to retrieve.
-  // Returns the length of the list.
-  virtual size_t GetUrlList(std::string** list) = 0;
-
-  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,
-    // set the |playback| to false and run the test. The source user data dir
-    // will be populated with an appropriate cache set.  If any of source
-    // urls are particularly slow, setting |kMaxWaitTime| higher while record
-    // may be useful.
-    bool playback = true;
-    if (playback) {
-      // Use the playback cache, but don't use playback events.
-      launch_arguments_.AppendSwitch(switches::kPlaybackMode);
-      launch_arguments_.AppendSwitch(switches::kNoEvents);
-
-      // Get the specified user data dir (optional)
-      FilePath profile_dir =
-          CommandLine::ForCurrentProcess()->GetSwitchValuePath(
-          switches::kUserDataDir);
-
-      if (profile_dir.empty()) {
-        if (!SetupTempDirectory(GetUserDataDirSource())) {
-          // There isn't really a way to fail gracefully here.
-          // Neither this constructor nor the SetUp() method return
-          // status to the caller.  So, just fall through using the
-          // default profile and log this.  The failure will be
-          // obvious.
-          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();
-    }
-
-    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::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));
-    ASSERT_TRUE(window.get());
-    int active_window = 0;  // The index of the window we are currently using.
-    scoped_refptr<TabProxy> tab(window->GetActiveTab());
-    ASSERT_TRUE(tab.get());
-    int expected_tab_count = 1;
-    for (unsigned counter = 0; counter < urls_length; ++counter) {
-      std::string url = urls[counter];
-
-      SCOPED_TRACE(url);
-
-      if (url == "<PAUSE>") {  // Special command to delay on this page
-        base::PlatformThread::Sleep(2000);
-        continue;
-      }
-
-      if (url == "<NEWTAB>") {  // Special command to create a new tab
-        if (++counter >= urls_length)
-          continue;  // Newtab was specified at end of list.  ignore.
-
-        url = urls[counter];
-        if (GetTabCount() < num_target_tabs) {
-          EXPECT_TRUE(window->AppendTab(GURL(url)));
-          expected_tab_count++;
-          WaitUntilTabCount(expected_tab_count);
-          tab = window->GetActiveTab();
-          ASSERT_TRUE(tab.get());
-          continue;
-        }
-
-        int tab_index = counter % num_target_tabs;  // A pseudo-random tab.
-        tab = window->GetTab(tab_index);
-        ASSERT_TRUE(tab.get());
-      }
-
-      if (url == "<NEXTTAB>") {  // Special command to select the next tab.
-        int tab_index, tab_count;
-        EXPECT_TRUE(window->GetActiveTabIndex(&tab_index));
-        EXPECT_TRUE(window->GetTabCount(&tab_count));
-        tab_index = (tab_index + 1) % tab_count;
-        tab = window->GetTab(tab_index);
-        ASSERT_TRUE(tab.get());
-        continue;
-      }
-
-      if (url == "<NEWWINDOW>") {  // Special command to create a new window.
-        if (counter + 1 >= urls_length)
-          continue;  // Newwindows was specified at end of list.  ignore.
-
-        int window_count;
-        EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-        EXPECT_TRUE(automation()->OpenNewBrowserWindow(Browser::TYPE_TABBED,
-                                                       show_window_));
-        int expected_window_count = window_count + 1;
-        EXPECT_TRUE(automation()->WaitForWindowCountToBecome(
-            expected_window_count));
-        EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-        EXPECT_EQ(expected_window_count, window_count);
-
-        // A new window will not load a url if requested too soon. The window
-        // stays on the new tab page instead.
-        base::PlatformThread::Sleep(200);
-
-        active_window = window_count - 1;
-        window = automation()->GetBrowserWindow(active_window);
-        ASSERT_TRUE(window.get());
-        tab = window->GetActiveTab();
-        ASSERT_TRUE(tab.get());
-        continue;
-      }
-
-      if (url == "<NEXTWINDOW>") {  // Select the next window.
-        int window_count;
-        EXPECT_TRUE(automation()->GetBrowserWindowCount(&window_count));
-        active_window = (active_window + 1) % window_count;
-        window = automation()->GetBrowserWindow(active_window);
-        ASSERT_TRUE(window.get());
-        tab = window->GetActiveTab();
-        ASSERT_TRUE(tab.get());
-        continue;
-      }
-
-      EXPECT_EQ(AUTOMATION_MSG_NAVIGATION_SUCCESS,
-          tab->NavigateToURL(GURL(urls[counter])));
-
-      // TODO(mbelshe): Bug 2953
-      // The automation crashes periodically if we cycle too quickly.
-      // To make these tests more reliable, slowing them down a bit.
-      base::PlatformThread::Sleep(100);
-    }
-
-    size_t stop_size = base::GetSystemCommitCharge();
-    PrintIOPerfInfo(test_name);
-    PrintMemoryUsageInfo(test_name);
-    PrintSystemCommitCharge(test_name, stop_size - start_size,
-                            true /* important */);
-  }
-
- private:
-  // Setup a temporary directory to store the profile to use
-  // with these tests.
-  // Input:
-  //   src_dir is set to the source directory
-  // Output:
-  //   On success, modifies user_data_dir_ to be a new profile directory
-  //   sets temp_dir_ to the containing temporary directory,
-  //   and sets cleanup_temp_dir_on_exit_ to true.
-  bool SetupTempDirectory(const FilePath& src_dir) {
-    VLOG(1) << "Setting up temp directory in " << src_dir.value();
-    // We create a copy of the test dir and use it so that each
-    // run of this test starts with the same data.  Running this
-    // test has the side effect that it will change the profile.
-    if (!file_util::CreateNewTempDirectory(kTempDirName, &temp_dir_)) {
-      LOG(ERROR) << "Could not create temp directory:" << kTempDirName;
-      return false;
-    }
-
-    if (!file_util::CopyDirectory(src_dir, temp_dir_, true)) {
-      LOG(ERROR) << "Could not copy temp directory";
-      return false;
-    }
-
-    // The profile directory was copied in to the containing temp
-    // directory as its base name, so point user_data_dir_ there.
-    user_data_dir_ = temp_dir_.Append(src_dir.BaseName());
-    cleanup_temp_dir_on_exit_ = true;
-    VLOG(1) << "Finished temp directory setup.";
-    return true;
-  }
-
-  bool cleanup_temp_dir_on_exit_;
-  FilePath temp_dir_;
-  FilePath user_data_dir_;
-};
-
-class GeneralMixMemoryTest : public MemoryTest {
- public:
-  virtual FilePath GetUserDataDirSource() const {
-    FilePath profile_dir;
-    PathService::Get(base::DIR_SOURCE_ROOT, &profile_dir);
-    profile_dir = profile_dir.AppendASCII("data");
-    profile_dir = profile_dir.AppendASCII("memory_test");
-    profile_dir = profile_dir.AppendASCII("general_mix");
-    return profile_dir;
-  }
-
-  virtual size_t GetUrlList(std::string** list) {
-    *list = urls_;
-    return urls_length_;
-  }
-
- private:
-  static std::string urls_[];
-  static size_t urls_length_;
-};
-
-// TODO(mbelshe): Separate this data to an external file.
-std::string GeneralMixMemoryTest::urls_[] = {
-  "http://www.yahoo.com/",
-  "http://hotjobs.yahoo.com/career-articles-the_biggest_resume_mistake_you_can_make-436",
-  "http://news.yahoo.com/s/ap/20080804/ap_on_re_mi_ea/odd_israel_home_alone",
-  "http://news.yahoo.com/s/nm/20080729/od_nm/subway_dc",
-  "http://search.yahoo.com/search?p=new+york+subway&ygmasrchbtn=web+search&fr=ush-news",
-  "<NEWTAB>",
-  "http://www.cnn.com/",
-  "http://www.cnn.com/2008/SHOWBIZ/TV/08/03/applegate.cancer.ap/index.html",
-  "http://www.cnn.com/2008/HEALTH/conditions/07/29/black.aids.report/index.html",
-  "http://www.cnn.com/POLITICS/",
-  "http://search.cnn.com/search.jsp?query=obama&type=web&sortBy=date&intl=false",
-  "<NEWTAB>",
-  "http://mail.google.com/",
-  "http://mail.google.com/mail/?shva=1",
-  "http://mail.google.com/mail/?shva=1#search/ipsec",
-  "http://mail.google.com/mail/?shva=1#search/ipsec/ee29ae66165d417",
-  "http://mail.google.com/mail/?shva=1#compose",
-  "<NEWTAB>",
-  "http://docs.google.com/",
-  "<NEWTAB>",
-  "http://calendar.google.com/",
-  "<NEWTAB>",
-  "http://maps.google.com/",
-  "http://maps.google.com/maps/mpl?moduleurl=http://earthquake.usgs.gov/eqcenter/mapplets/earthquakes.xml&ie=UTF8&ll=20,170&spn=140.625336,73.828125&t=k&z=2",
-  "http://maps.google.com/maps?f=q&hl=en&geocode=&q=1600+amphitheater+parkway,+mountain+view,+ca&ie=UTF8&z=13",
-  "<NEWTAB>",
-  "http://www.google.com/",
-  "http://www.google.com/search?hl=en&q=food&btnG=Google+Search",
-  "http://books.google.com/books?hl=en&q=food&um=1&ie=UTF-8&sa=N&tab=wp",
-  "http://images.google.com/images?hl=en&q=food&um=1&ie=UTF-8&sa=N&tab=pi",
-  "http://news.google.com/news?hl=en&q=food&um=1&ie=UTF-8&sa=N&tab=in",
-  "http://www.google.com/products?sa=N&tab=nf&q=food",
-  "<NEWTAB>",
-  "http://www.scoundrelspoint.com/polyhedra/shuttle/index.html",
-  "<PAUSE>",
-  "<NEWTAB>",
-  "http://ctho.ath.cx/toys/3d.html",
-  "<PAUSE>",
-  "<NEWTAB>",
-  "http://www.youtube.com/",
-  "http://www.youtube.com/results?search_query=funny&search_type=&aq=f",
-  "http://www.youtube.com/watch?v=GuMMfgWhm3g",
-  "<NEWTAB>",
-  "http://www.craigslist.com/",
-  "http://sfbay.craigslist.org/",
-  "http://sfbay.craigslist.org/apa/",
-  "http://sfbay.craigslist.org/sfc/apa/782398209.html",
-  "http://sfbay.craigslist.org/sfc/apa/782347795.html",
-  "http://sfbay.craigslist.org/sby/apa/782342791.html",
-  "http://sfbay.craigslist.org/sfc/apa/782344396.html",
-  "<NEWTAB>",
-  "http://www.whitehouse.gov/",
-  "http://www.whitehouse.gov/news/releases/2008/07/20080729.html",
-  "http://www.whitehouse.gov/infocus/afghanistan/",
-  "http://www.whitehouse.gov/infocus/africa/",
-  "<NEWTAB>",
-  "http://www.msn.com/",
-  "http://msn.foxsports.com/horseracing/story/8409670/Big-Brown-rebounds-in-Haskell-Invitational?MSNHPHMA",
-  "http://articles.moneycentral.msn.com/Investing/StockInvestingTrading/TheBiggestRiskToYourRetirement_SeriesHome.aspx",
-  "http://articles.moneycentral.msn.com/Investing/StockInvestingTrading/TheSmartWayToGetRich.aspx",
-  "http://articles.moneycentral.msn.com/Investing/ContrarianChronicles/TheFictionOfCorporateTransparency.aspx",
-  "<NEWTAB>",
-  "http://flickr.com/",
-  "http://flickr.com/explore/interesting/2008/03/18/",
-  "http://flickr.com/photos/chavals/2344906748/",
-  "http://flickr.com/photos/rosemary/2343058024/",
-  "http://flickr.com/photos/arbaa/2343235019/",
-  "<NEWTAB>",
-  "http://zh.wikipedia.org/wiki/%E6%B1%B6%E5%B7%9D%E5%A4%A7%E5%9C%B0%E9%9C%87",
-  "http://zh.wikipedia.org/wiki/5%E6%9C%8812%E6%97%A5",
-  "http://zh.wikipedia.org/wiki/5%E6%9C%8820%E6%97%A5",
-  "http://zh.wikipedia.org/wiki/%E9%A6%96%E9%A1%B5",
-  "<NEWTAB>",
-  "http://www.nytimes.com/pages/technology/index.html",
-  "http://pogue.blogs.nytimes.com/2008/07/17/a-candy-store-for-the-iphone/",
-  "http://www.nytimes.com/2008/07/21/technology/21pc.html?_r=1&ref=technology&oref=slogin",
-  "http://bits.blogs.nytimes.com/2008/07/19/a-wikipedian-challenge-convincing-arabic-speakers-to-write-in-arabic/",
-  "<NEWTAB>",
-  "http://www.amazon.com/exec/obidos/tg/browse/-/502394/ref=topnav_storetab_p",
-  "http://www.amazon.com/Panasonic-DMC-TZ5K-Digital-Optical-Stabilized/dp/B0011Z8CCG/ref=pd_ts_p_17?ie=UTF8&s=photo",
-  "http://www.amazon.com/Nikon-Coolpix-Digital-Vibration-Reduction/dp/B0012OI6HW/ref=pd_ts_p_24?ie=UTF8&s=photo",
-  "http://www.amazon.com/Digital-SLRs-Cameras-Photo/b/ref=sv_p_2?ie=UTF8&node=3017941",
-  "<NEWTAB>",
-  "http://www.boston.com/bigpicture/2008/07/californias_continuing_fires.html",
-  "http://www.boston.com/business/",
-  "http://www.boston.com/business/articles/2008/07/29/staples_has_a_games_plan/",
-  "http://www.boston.com/business/personalfinance/articles/2008/08/04/a_grim_forecast_for_heating_costs/",
-  "<NEWTAB>",
-  "http://arstechnica.com/",
-  "http://arstechnica.com/news.ars/post/20080721-this-years-e3-substance-over-styleand-far-from-dead.html",
-  "http://arstechnica.com/news.ars/post/20080729-ifpi-italian-police-take-down-italian-bittorrent-tracker.html",
-  "http://arstechnica.com/news.ars/post/20080804-congress-wants-privacy-answers-from-google-ms-aol.html",
-  "<NEWTAB>",
-  "http://finance.google.com/finance?q=NASDAQ:AAPL",
-  "http://finance.google.com/finance?q=GOOG&hl=en",
-  "<NEWTAB>",
-  "http://blog.wired.com/underwire/2008/07/futurama-gets-m.html",
-  "http://blog.wired.com/cars/2008/07/gas-prices-hit.html",
-  "<NEWTAB>",
-  "http://del.icio.us/popular/programming",
-  "http://del.icio.us/popular/",
-  "http://del.icio.us/tag/",
-  "<NEWTAB>",
-  "http://gadgets.boingboing.net/2008/07/21/boom-computing.html",
-  "http://3533.spreadshirt.com/us/US/Shop/",
-  "<NEWTAB>",
-  "http://www.autoblog.com/",
-  "http://www.autoblog.com/2008/07/21/audi-introduces-the-next-mmi/",
-  "http://www.autoblog.com/categories/auto-types/",
-  "http://www.autoblog.com/category/sports/",
-  "<NEWTAB>",
-  "http://www.wikipedia.org/",
-  "http://en.wikipedia.org/wiki/Main_Page",
-  "http://fr.wikipedia.org/wiki/Accueil",
-  "http://de.wikipedia.org/wiki/Hauptseite",
-  "http://ja.wikipedia.org/wiki/%E3%83%A1%E3%82%A4%E3%83%B3%E3%83%9A%E3%83%BC%E3%82%B8",
-  "http://it.wikipedia.org/wiki/Pagina_principale",
-  "http://nl.wikipedia.org/wiki/Hoofdpagina",
-  "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 GeneralMixReferenceMemoryTest : public GeneralMixMemoryTest {
- public:
-  void SetUp() {
-    UseReferenceBuild();
-    GeneralMixMemoryTest::SetUp();
-  }
-};
-
-class MembusterMemoryTest : public MemoryTest {
- public:
-  MembusterMemoryTest() : test_urls_(NULL) {}
-
-  virtual ~MembusterMemoryTest() {
-    delete[] test_urls_;
-  }
-
-  virtual FilePath GetUserDataDirSource() const {
-    FilePath profile_dir;
-    PathService::Get(base::DIR_SOURCE_ROOT, &profile_dir);
-    profile_dir = profile_dir.AppendASCII("data");
-    profile_dir = profile_dir.AppendASCII("memory_test");
-    profile_dir = profile_dir.AppendASCII("membuster");
-    return profile_dir;
-  }
-
-  virtual size_t GetUrlList(std::string** list) {
-    size_t total_url_entries = urls_length_ * kIterations_ * 2 - 1;
-    if (!test_urls_) {
-      test_urls_ = new std::string[total_url_entries];
-
-      // Open url_length_ + 1 windows as we access urls. We start with one
-      // open window.
-      test_urls_[0] = source_urls_[0];
-      size_t fill_position = 1;
-      size_t source_url_index = 1;
-      for (; fill_position <= urls_length_ * 2; fill_position += 2) {
-        test_urls_[fill_position] = "<NEWWINDOW>";
-        test_urls_[fill_position + 1] = source_urls_[source_url_index];
-        source_url_index = (source_url_index + 1) % urls_length_;
-      }
-
-      // Then cycle through all the urls to fill out the list.
-      for (; fill_position < total_url_entries; fill_position += 2) {
-        test_urls_[fill_position] = "<NEXTWINDOW>";
-        test_urls_[fill_position + 1] = source_urls_[source_url_index];
-        source_url_index = (source_url_index + 1) % urls_length_;
-      }
-    }
-    *list = test_urls_;
-    return total_url_entries;
-  }
-
- private:
-  static const int kIterations_ = 11;
-
-  static std::string source_urls_[];
-  static size_t urls_length_;
-
-  std::string* test_urls_;
-};
-
-// membuster traverses the list in reverse order.  We just list them that way.
-std::string MembusterMemoryTest::source_urls_[] = {
-  "http://joi.ito.com/archives/email/",
-  "http://joi.ito.com/jp/",
-  "http://forums.studentdoctor.net/showthread.php?t=469342",
-  "http://forums.studentdoctor.net/forumdisplay.php?s=718b9d0e8692d7c3f4cc7c64faffd17b&f=10",
-  "http://de.wikipedia.org/wiki/Hauptseite",
-  "http://zh.wikipedia.org/wiki/",
-  "http://ru.wikipedia.org/wiki/",
-  "http://ja.wikipedia.org/wiki/",
-  "http://en.wikipedia.org/wiki/Main_Page",
-  "http://wikitravel.org/ru/",
-  "http://wikitravel.org/hi/",
-  "http://wikitravel.org/he/",
-  "http://wikitravel.org/ja/",
-  "http://wikitravel.org/en/Main_Page",
-  "http://wikitravel.org/en/China",
-  "http://www.vodcars.com/",
-  "http://en.wikinews.org/wiki/Main_Page",
-  "http://creativecommons.org/",
-  "http://pushingdaisies.wikia.com/wiki/Pushing_Daisies",
-  "http://www.wowwiki.com/Main_Page",
-  "http://spademanns.wikia.com/wiki/Forside",
-  "http://ja.uncyclopedia.info/wiki/",
-  "http://uncyclopedia.org/wiki/Babel:Vi",
-  "http://uncyclopedia.org/wiki/Main_Page",
-  "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_);
-
-#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); \
-}
-
-GENERAL_MIX_MEMORY_TESTS(SingleTabTest, 1);
-GENERAL_MIX_MEMORY_TESTS(FiveTabTest, 5);
-GENERAL_MIX_MEMORY_TESTS(TwelveTabTest, 12);
-
-// Commented out until the recorded cache data is added.
-//TEST_F(MembusterMemoryTest, Windows) {
-//  RunTest("membuster", 0);
-//}
-
-}  // namespace