Make all of our unit tests be PlatformTests to get an autorelease pool.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/178037

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

35 files changed, 71 insertions, 37 deletions

diff --git a/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm b/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
index 1202a0e..bdac762 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_cell_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/autocomplete_text_field_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class AutocompleteTextFieldCellTest : public testing::Test {
+class AutocompleteTextFieldCellTest : public PlatformTest {
  public:
   AutocompleteTextFieldCellTest() {
     // Make sure this is wide enough to play games with the cell
diff --git a/chrome/browser/cocoa/autocomplete_text_field_unittest.mm b/chrome/browser/cocoa/autocomplete_text_field_unittest.mm
index e2f91e7..f8db667 100644
--- a/chrome/browser/cocoa/autocomplete_text_field_unittest.mm
+++ b/chrome/browser/cocoa/autocomplete_text_field_unittest.mm
@@ -10,6 +10,7 @@
 #import "chrome/browser/cocoa/autocomplete_text_field_editor.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 @interface AutocompleteTextFieldTestDelegate : NSObject {
   BOOL textShouldPaste_;
@@ -33,7 +34,7 @@
 
 namespace {
 
-class AutocompleteTextFieldTest : public testing::Test {
+class AutocompleteTextFieldTest : public PlatformTest {
  public:
   AutocompleteTextFieldTest() {
     // Make sure this is wide enough to play games with the cell
diff --git a/chrome/browser/cocoa/background_gradient_view_unittest.mm b/chrome/browser/cocoa/background_gradient_view_unittest.mm
index 7a215a3..7b5e0c0 100644
--- a/chrome/browser/cocoa/background_gradient_view_unittest.mm
+++ b/chrome/browser/cocoa/background_gradient_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/background_gradient_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class BackgroundGradientViewTest : public testing::Test {
+class BackgroundGradientViewTest : public PlatformTest {
  public:
   BackgroundGradientViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 30);
diff --git a/chrome/browser/cocoa/base_view_unittest.mm b/chrome/browser/cocoa/base_view_unittest.mm
index 07d0574..6192055 100644
--- a/chrome/browser/cocoa/base_view_unittest.mm
+++ b/chrome/browser/cocoa/base_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/base_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class BaseViewTest : public testing::Test {
+class BaseViewTest : public PlatformTest {
  public:
   BaseViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 100);
diff --git a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm b/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm
index f260903..38a872d 100644
--- a/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_bridge_unittest.mm
@@ -7,6 +7,7 @@
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // TODO(jrg): add OCMock to Chromium to save some typing.
 
@@ -90,7 +91,7 @@ typedef std::pair<GURL,WindowOpenDisposition> OpenInfo;
 @end
 
 
-class BookmarkBarBridgeTest : public testing::Test {
+class BookmarkBarBridgeTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
   BrowserTestHelper browser_test_helper_;
diff --git a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
index d72caa3..66a87bc 100644
--- a/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_controller_unittest.mm
@@ -12,6 +12,7 @@
 #include "chrome/browser/cocoa/test_event_utils.h"
 #import "chrome/browser/cocoa/view_resizer_pong.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // Pretend BookmarkURLOpener delegate to keep track of requests
 @interface BookmarkURLOpenerPong : NSObject<BookmarkURLOpener> {
@@ -80,7 +81,7 @@ namespace {
 static const int kContentAreaHeight = 500;
 static const int kInfoBarViewHeight = 30;
 
-class BookmarkBarControllerTest : public testing::Test {
+class BookmarkBarControllerTest : public PlatformTest {
  public:
   BookmarkBarControllerTest() {
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
diff --git a/chrome/browser/cocoa/bookmark_bar_view_unittest.mm b/chrome/browser/cocoa/bookmark_bar_view_unittest.mm
index 3ba675a..000d7fa 100644
--- a/chrome/browser/cocoa/bookmark_bar_view_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bar_view_unittest.mm
@@ -6,10 +6,11 @@
 #import "chrome/browser/cocoa/bookmark_bar_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class BookmarkBarViewTest : public testing::Test {
+class BookmarkBarViewTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
   scoped_nsobject<BookmarkBarView> view_;
diff --git a/chrome/browser/cocoa/bookmark_bubble_window_unittest.mm b/chrome/browser/cocoa/bookmark_bubble_window_unittest.mm
index 08baec4..9c53652 100644
--- a/chrome/browser/cocoa/bookmark_bubble_window_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_bubble_window_unittest.mm
@@ -6,8 +6,9 @@
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/bookmark_bubble_window.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
-class BookmarkBubbleWindowTest : public testing::Test {
+class BookmarkBubbleWindowTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
 };
diff --git a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm b/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
index 7074084..9cb6ca6 100644
--- a/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_button_cell_unittest.mm
@@ -6,10 +6,11 @@
 #import "chrome/browser/cocoa/bookmark_button_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class BookmarkButtonCellTest : public testing::Test {
+class BookmarkButtonCellTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   scoped_nsobject<NSButton> view_;
diff --git a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
index de08e1d..01c969f 100644
--- a/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_editor_controller_unittest.mm
@@ -9,8 +9,9 @@
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
-class BookmarkEditorControllerTest : public testing::Test {
+class BookmarkEditorControllerTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   BrowserTestHelper helper_;
diff --git a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm b/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm
index bf00f68..6a543b8 100644
--- a/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/cocoa/bookmark_name_folder_controller_unittest.mm
@@ -9,8 +9,9 @@
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
-class BookmarkNameFolderControllerTest : public testing::Test {
+class BookmarkNameFolderControllerTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
   BrowserTestHelper helper_;
diff --git a/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm b/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
index 0f2b067..b26db74 100644
--- a/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
+++ b/chrome/browser/cocoa/clear_browsing_data_controller_unittest.mm
@@ -13,10 +13,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class ClearBrowsingDataControllerTest : public testing::Test {
+class ClearBrowsingDataControllerTest : public PlatformTest {
  public:
   ClearBrowsingDataControllerTest() {
     // Set up some interesting prefs:
diff --git a/chrome/browser/cocoa/command_observer_bridge_unittest.mm b/chrome/browser/cocoa/command_observer_bridge_unittest.mm
index b510b3f..40fed56 100644
--- a/chrome/browser/cocoa/command_observer_bridge_unittest.mm
+++ b/chrome/browser/cocoa/command_observer_bridge_unittest.mm
@@ -8,6 +8,7 @@
 #include "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/command_observer_bridge.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // Implements the callback interface. Records the last command id and
 // enabled state it has received so it can be queried by the tests to see
@@ -36,7 +37,7 @@
 
 namespace {
 
-class CommandObserverBridgeTest : public testing::Test {
+class CommandObserverBridgeTest : public PlatformTest {
  public:
   CommandObserverBridgeTest()
       : updater_(new CommandUpdater(NULL)),
diff --git a/chrome/browser/cocoa/custom_home_pages_model_unittest.mm b/chrome/browser/cocoa/custom_home_pages_model_unittest.mm
index 1d31ed4..a139103 100644
--- a/chrome/browser/cocoa/custom_home_pages_model_unittest.mm
+++ b/chrome/browser/cocoa/custom_home_pages_model_unittest.mm
@@ -6,6 +6,7 @@
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/custom_home_pages_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // A helper for KVO and NSNotifications. Makes a note that it's been called
 // back.
@@ -28,7 +29,7 @@
 }
 @end
 
-class CustomHomePagesModelTest : public testing::Test {
+class CustomHomePagesModelTest : public PlatformTest {
  public:
   CustomHomePagesModelTest() {
     model_.reset([[CustomHomePagesModel alloc]
diff --git a/chrome/browser/cocoa/download_shelf_mac_unittest.mm b/chrome/browser/cocoa/download_shelf_mac_unittest.mm
index 1df20e3..8819d81 100644
--- a/chrome/browser/cocoa/download_shelf_mac_unittest.mm
+++ b/chrome/browser/cocoa/download_shelf_mac_unittest.mm
@@ -6,7 +6,7 @@
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/download_shelf_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
-
+#include "testing/platform_test.h"
 
 // A fake implementation of DownloadShelfController. It implements only the
 // methods that DownloadShelfMac call during the tests in this file. We get this
@@ -45,7 +45,7 @@
 
 namespace {
 
-class DownloadShelfMacTest : public testing::Test {
+class DownloadShelfMacTest : public PlatformTest {
 
   virtual void SetUp() {
     shelf_controller_.reset([[FakeDownloadShelfController alloc] init]);
diff --git a/chrome/browser/cocoa/download_shelf_view_unittest.mm b/chrome/browser/cocoa/download_shelf_view_unittest.mm
index 7d6431f..1ddcc74 100644
--- a/chrome/browser/cocoa/download_shelf_view_unittest.mm
+++ b/chrome/browser/cocoa/download_shelf_view_unittest.mm
@@ -6,10 +6,11 @@
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/download_shelf_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class DownloadShelfViewTest : public testing::Test {
+class DownloadShelfViewTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
   scoped_nsobject<DownloadShelfView> view_;
diff --git a/chrome/browser/cocoa/download_util_mac_unittest.mm b/chrome/browser/cocoa/download_util_mac_unittest.mm
index 6789b16..4369275 100644
--- a/chrome/browser/cocoa/download_util_mac_unittest.mm
+++ b/chrome/browser/cocoa/download_util_mac_unittest.mm
@@ -10,10 +10,11 @@
 #import "chrome/browser/cocoa/download_util_mac.h"
 #include "chrome/common/chrome_paths.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class DownloadUtilTest : public testing::Test {
+class DownloadUtilTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
 };
diff --git a/chrome/browser/cocoa/event_utils_unittest.mm b/chrome/browser/cocoa/event_utils_unittest.mm
index c9d3642..662826c 100644
--- a/chrome/browser/cocoa/event_utils_unittest.mm
+++ b/chrome/browser/cocoa/event_utils_unittest.mm
@@ -8,6 +8,7 @@
 #include "chrome/browser/cocoa/event_utils.h"
 #include "chrome/browser/cocoa/test_event_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // We provide a donor class with a specially modified |modifierFlags|
 // implementation that we swap with NSEvent's. This is because we can't create a
@@ -20,7 +21,7 @@
 
 namespace {
 
-class EventUtilsTest : public testing::Test {
+class EventUtilsTest : public PlatformTest {
  private:
   CocoaTestHelper cocoa_helper_;  // Inits Cocoa, creates window, etc...
 };
diff --git a/chrome/browser/cocoa/find_bar_bridge_unittest.mm b/chrome/browser/cocoa/find_bar_bridge_unittest.mm
index def2c2c..f945d50 100644
--- a/chrome/browser/cocoa/find_bar_bridge_unittest.mm
+++ b/chrome/browser/cocoa/find_bar_bridge_unittest.mm
@@ -6,10 +6,11 @@
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/find_bar_bridge.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class FindBarBridgeTest : public testing::Test {
+class FindBarBridgeTest : public PlatformTest {
  protected:
   CocoaTestHelper helper_;
 };
diff --git a/chrome/browser/cocoa/find_bar_view_unittest.mm b/chrome/browser/cocoa/find_bar_view_unittest.mm
index e9c734b..734dcd9 100644
--- a/chrome/browser/cocoa/find_bar_view_unittest.mm
+++ b/chrome/browser/cocoa/find_bar_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/find_bar_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class FindBarViewTest : public testing::Test {
+class FindBarViewTest : public PlatformTest {
  public:
   FindBarViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 30);
diff --git a/chrome/browser/cocoa/fullscreen_window_unittest.mm b/chrome/browser/cocoa/fullscreen_window_unittest.mm
index c12f1fd..fda2fc6 100644
--- a/chrome/browser/cocoa/fullscreen_window_unittest.mm
+++ b/chrome/browser/cocoa/fullscreen_window_unittest.mm
@@ -6,8 +6,9 @@
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/fullscreen_window.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
-class FullscreenWindowTest : public testing::Test {
+class FullscreenWindowTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
 };
diff --git a/chrome/browser/cocoa/gradient_button_cell_unittest.mm b/chrome/browser/cocoa/gradient_button_cell_unittest.mm
index e9229a7..14c16de 100644
--- a/chrome/browser/cocoa/gradient_button_cell_unittest.mm
+++ b/chrome/browser/cocoa/gradient_button_cell_unittest.mm
@@ -8,6 +8,7 @@
 #import "chrome/browser/cocoa/gradient_button_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 @interface GradientButtonCell (HoverValueTesting)
 - (void)adjustHoverValue;
@@ -15,7 +16,7 @@
 
 namespace {
 
-class GradientButtonCellTest : public testing::Test {
+class GradientButtonCellTest : public PlatformTest {
  public:
   GradientButtonCellTest() {
     NSRect frame = NSMakeRect(0, 0, 50, 30);
diff --git a/chrome/browser/cocoa/infobar_container_controller_unittest.mm b/chrome/browser/cocoa/infobar_container_controller_unittest.mm
index b50e7d4..274ebec 100644
--- a/chrome/browser/cocoa/infobar_container_controller_unittest.mm
+++ b/chrome/browser/cocoa/infobar_container_controller_unittest.mm
@@ -12,10 +12,11 @@
 #include "chrome/browser/cocoa/infobar_test_helper.h"
 #import "chrome/browser/cocoa/view_resizer_pong.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class InfoBarContainerControllerTest : public testing::Test {
+class InfoBarContainerControllerTest : public PlatformTest {
   virtual void SetUp() {
     resizeDelegate_.reset([[ViewResizerPong alloc] init]);
     TabStripModel* model = browser_helper_.browser()->tabstrip_model();
diff --git a/chrome/browser/cocoa/infobar_gradient_view_unittest.mm b/chrome/browser/cocoa/infobar_gradient_view_unittest.mm
index ab306ba..fafa206 100644
--- a/chrome/browser/cocoa/infobar_gradient_view_unittest.mm
+++ b/chrome/browser/cocoa/infobar_gradient_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/infobar_gradient_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class InfoBarGradientViewTest : public testing::Test {
+class InfoBarGradientViewTest : public PlatformTest {
  public:
   InfoBarGradientViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 30);
diff --git a/chrome/browser/cocoa/location_bar_view_mac_unittest.mm b/chrome/browser/cocoa/location_bar_view_mac_unittest.mm
index 9104001..072f96e 100644
--- a/chrome/browser/cocoa/location_bar_view_mac_unittest.mm
+++ b/chrome/browser/cocoa/location_bar_view_mac_unittest.mm
@@ -11,6 +11,7 @@
 #include "chrome/browser/cocoa/location_bar_view_mac.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // TODO(shess): Figure out how to unittest this.  The code below was
 // testing the hacked-up behavior so you didn't have to be pedantic
@@ -19,7 +20,7 @@
 // http://code.google.com/p/chromium/issues/detail?id=9977
 
 #if 0
-class LocationBarViewMacTest : public testing::Test {
+class LocationBarViewMacTest : public PlatformTest {
  public:
   LocationBarViewMacTest()
       : field_([[NSTextField alloc] init]),
@@ -58,7 +59,7 @@ TEST_F(LocationBarViewMacTest, GetInputString) {
 
 namespace {
 
-class LocationBarViewMacTest : public testing::Test {
+class LocationBarViewMacTest : public PlatformTest {
  public:
   LocationBarViewMacTest() {
     // Make sure this is wide enough to play games with the cell
diff --git a/chrome/browser/cocoa/nsimage_cache_unittest.mm b/chrome/browser/cocoa/nsimage_cache_unittest.mm
index b151218..4c348d8 100644
--- a/chrome/browser/cocoa/nsimage_cache_unittest.mm
+++ b/chrome/browser/cocoa/nsimage_cache_unittest.mm
@@ -10,10 +10,11 @@
 #include "chrome/browser/cocoa/nsimage_cache.h"
 #include "chrome/common/mac_app_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class NSImageCacheTest : public testing::Test {
+class NSImageCacheTest : public PlatformTest {
  public:
   NSImageCacheTest() {
     // Look in the Chromium app bundle for resources.
diff --git a/chrome/browser/cocoa/sad_tab_view_unittest.mm b/chrome/browser/cocoa/sad_tab_view_unittest.mm
index 9b6a0706..49c24e3 100644
--- a/chrome/browser/cocoa/sad_tab_view_unittest.mm
+++ b/chrome/browser/cocoa/sad_tab_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/sad_tab_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class SadTabViewTest : public testing::Test {
+class SadTabViewTest : public PlatformTest {
  public:
   SadTabViewTest() {
     NSRect content_frame = [cocoa_helper_.contentView() frame];
diff --git a/chrome/browser/cocoa/search_engine_list_model_unittest.mm b/chrome/browser/cocoa/search_engine_list_model_unittest.mm
index 9e592e7..600d9bb 100644
--- a/chrome/browser/cocoa/search_engine_list_model_unittest.mm
+++ b/chrome/browser/cocoa/search_engine_list_model_unittest.mm
@@ -9,6 +9,7 @@
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_model.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 // A helper for NSNotifications. Makes a note that it's been called back.
 @interface SearchEngineListHelper : NSObject {
@@ -23,7 +24,7 @@
 }
 @end
 
-class SearchEngineListModelTest : public testing::Test {
+class SearchEngineListModelTest : public PlatformTest {
  public:
   SearchEngineListModelTest() {
     // Build a fake set of template urls.
diff --git a/chrome/browser/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/cocoa/status_bubble_mac_unittest.mm
index b4697875..2482d96 100644
--- a/chrome/browser/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/cocoa/status_bubble_mac_unittest.mm
@@ -10,6 +10,7 @@
 #include "chrome/browser/cocoa/status_bubble_mac.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 #import "third_party/GTM/AppKit/GTMTheme.h"
 
 @interface StatusBubbleMacTestWindowDelegate : NSObject <GTMThemeDelegate>;
@@ -21,7 +22,7 @@
 }
 @end
 
-class StatusBubbleMacTest : public testing::Test {
+class StatusBubbleMacTest : public PlatformTest {
  public:
   StatusBubbleMacTest() {
     NSWindow* window = cocoa_helper_.window();
diff --git a/chrome/browser/cocoa/tab_cell_unittest.mm b/chrome/browser/cocoa/tab_cell_unittest.mm
index c27c197..9eb29fc 100644
--- a/chrome/browser/cocoa/tab_cell_unittest.mm
+++ b/chrome/browser/cocoa/tab_cell_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/tab_cell.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class TabCellTest : public testing::Test {
+class TabCellTest : public PlatformTest {
  public:
   TabCellTest() {
     NSRect frame = NSMakeRect(0, 0, 50, 30);
diff --git a/chrome/browser/cocoa/tab_strip_controller_unittest.mm b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
index 723c69a..9d71eb3 100644
--- a/chrome/browser/cocoa/tab_strip_controller_unittest.mm
+++ b/chrome/browser/cocoa/tab_strip_controller_unittest.mm
@@ -9,6 +9,7 @@
 #import "chrome/browser/cocoa/tab_strip_controller.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
@@ -57,7 +58,7 @@ class TestTabStripDelegate : public TabStripModelDelegate {
   virtual bool CanCloseContentsAt(int index) { return true; }
 };
 
-class TabStripControllerTest : public testing::Test {
+class TabStripControllerTest : public PlatformTest {
  public:
   TabStripControllerTest() {
     NSView* parent = cocoa_helper_.contentView();
diff --git a/chrome/browser/cocoa/tab_strip_view_unittest.mm b/chrome/browser/cocoa/tab_strip_view_unittest.mm
index 52c06e2..d1a7007 100644
--- a/chrome/browser/cocoa/tab_strip_view_unittest.mm
+++ b/chrome/browser/cocoa/tab_strip_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/tab_strip_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class TabStripViewTest : public testing::Test {
+class TabStripViewTest : public PlatformTest {
  public:
   TabStripViewTest() {
     NSRect frame = NSMakeRect(0, 0, 100, 30);
diff --git a/chrome/browser/cocoa/tab_view_unittest.mm b/chrome/browser/cocoa/tab_view_unittest.mm
index 44cf629..ac73789 100644
--- a/chrome/browser/cocoa/tab_view_unittest.mm
+++ b/chrome/browser/cocoa/tab_view_unittest.mm
@@ -8,10 +8,11 @@
 #import "chrome/browser/cocoa/tab_view.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class TabViewTest : public testing::Test {
+class TabViewTest : public PlatformTest {
  public:
   TabViewTest() {
     NSRect frame = NSMakeRect(0, 0, 50, 30);
diff --git a/chrome/browser/cocoa/toolbar_controller_unittest.mm b/chrome/browser/cocoa/toolbar_controller_unittest.mm
index b96726e..678bfd5 100644
--- a/chrome/browser/cocoa/toolbar_controller_unittest.mm
+++ b/chrome/browser/cocoa/toolbar_controller_unittest.mm
@@ -13,10 +13,11 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class ToolbarControllerTest : public testing::Test {
+class ToolbarControllerTest : public PlatformTest {
  public:
 
   // Indexes that match the ordering returned by the private ToolbarController
diff --git a/chrome/browser/cocoa/toolbar_view_unittest.mm b/chrome/browser/cocoa/toolbar_view_unittest.mm
index 19eac0c..1b2c499 100644
--- a/chrome/browser/cocoa/toolbar_view_unittest.mm
+++ b/chrome/browser/cocoa/toolbar_view_unittest.mm
@@ -6,10 +6,11 @@
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/toolbar_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "testing/platform_test.h"
 
 namespace {
 
-class ToolbarViewTest : public testing::Test {
+class ToolbarViewTest : public PlatformTest {
  public:
   CocoaTestHelper cocoa_helper_;
   scoped_nsobject<ToolbarView> view_;