ui/gfx: Cleanup GfxTestSuite class.

- Remove a few unnecessary includes.
- Add missing OVERRIDE to overridden methods.
- Add missing base:: prefix.
- Include the right mac file.

BUG=None
TEST=ui_unittests

R=phajdan.jr@chromium.org

Review URL: http://codereview.chromium.org/7185016

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

2 files changed, 8 insertions, 12 deletions

diff --git a/ui/gfx/test_suite.cc b/ui/gfx/test_suite.cc
index 6cbb32b..5d65ec4 100644
--- a/ui/gfx/test_suite.cc
+++ b/ui/gfx/test_suite.cc
@@ -6,19 +6,17 @@
 
 #include "base/file_path.h"
 #include "base/path_service.h"
-#include "base/mac/scoped_nsautorelease_pool.h"
+#include "build/build_config.h"
 #include "ui/gfx/gfx_paths.h"
 
 #if defined(OS_MACOSX)
-#include "base/mac/mac_util.h"
+#include "base/mac/foundation_util.h"
 #endif
 
 GfxTestSuite::GfxTestSuite(int argc, char** argv) : TestSuite(argc, argv) {}
 
 void GfxTestSuite::Initialize() {
-  base::mac::ScopedNSAutoreleasePool autorelease_pool;
-
-  TestSuite::Initialize();
+  base::TestSuite::Initialize();
 
   gfx::RegisterPathProvider();
 
@@ -44,5 +42,5 @@ void GfxTestSuite::Shutdown() {
 #if defined(OS_MACOSX)
   base::mac::SetOverrideAppBundle(NULL);
 #endif
-  TestSuite::Shutdown();
+  base::TestSuite::Shutdown();
 }
diff --git a/ui/gfx/test_suite.h b/ui/gfx/test_suite.h
index 488ea31..02e5ef1 100644
--- a/ui/gfx/test_suite.h
+++ b/ui/gfx/test_suite.h
@@ -6,19 +6,17 @@
 #define UI_GFX_TEST_SUITE_H_
 #pragma once
 
-#include <string>
-
+#include "base/compiler_specific.h"
 #include "base/test/test_suite.h"
-#include "build/build_config.h"
 
 class GfxTestSuite : public base::TestSuite {
  public:
   GfxTestSuite(int argc, char** argv);
 
  protected:
-  // Overridden from base::TestSuite:
-  virtual void Initialize();
-  virtual void Shutdown();
+  // base::TestSuite:
+  virtual void Initialize() OVERRIDE;
+  virtual void Shutdown() OVERRIDE;
 };
 
 #endif  // UI_GFX_TEST_SUITE_H_