Reland "Move a good set of gfx unit tests into gfx_unittests target."

ui/gfx/test/run_all_unittests.cc

Index: ui/gfx/test/run_all_unittests.cc
diff --git a/ui/keyboard/test/run_all_unittests.cc b/ui/gfx/test/run_all_unittests.cc
similarity index 58%
copy from ui/keyboard/test/run_all_unittests.cc
copy to ui/gfx/test/run_all_unittests.cc
index 9ecd0c603f12d986cfba8bad33e44430e02f1c54..6e50e200589c28de5cb0dce1750b31d1311e9659 100644
--- a/ui/keyboard/test/run_all_unittests.cc
+++ b/ui/gfx/test/run_all_unittests.cc
@@ -8,26 +8,27 @@
 #include "base/path_service.h"
 #include "base/test/launcher/unit_test_launcher.h"
 #include "base/test/test_suite.h"
-#include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
-#include "ui/gl/gl_surface.h"
 
 namespace {
 
-class KeyboardTestSuite : public base::TestSuite {
+class GfxTestSuite : public base::TestSuite {
  public:
-  KeyboardTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
+  GfxTestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {}
 
  protected:
   virtual void Initialize() OVERRIDE {
     base::TestSuite::Initialize();
-    gfx::GLSurface::InitializeOneOffForTests();
     ui::RegisterPathProvider();
 
-    base::FilePath ui_test_pak_path;
-    ASSERT_TRUE(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
-    ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+    base::FilePath pak_dir;
+    PathService::Get(base::DIR_MODULE, &pak_dir);
+
+    base::FilePath pak_file;
+    pak_file = pak_dir.Append(FILE_PATH_LITERAL("ui_test.pak"));
+
+    ui::ResourceBundle::InitSharedInstanceWithPakPath(pak_file);
   }
 
   virtual void Shutdown() OVERRIDE {
@@ -36,16 +37,16 @@ class KeyboardTestSuite : public base::TestSuite {
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(KeyboardTestSuite);
+  DISALLOW_COPY_AND_ASSIGN(GfxTestSuite);
 };
 
 }  // namespace
 
 int main(int argc, char** argv) {
-  KeyboardTestSuite test_suite(argc, argv);
+  GfxTestSuite test_suite(argc, argv);
 
   return base::LaunchUnitTests(
       argc,
       argv,
-      base::Bind(&KeyboardTestSuite::Run, base::Unretained(&test_suite)));
+      base::Bind(&GfxTestSuite::Run, base::Unretained(&test_suite)));
 }