| OLD | NEW | 
|   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |   1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
|   2 // Use of this source code is governed by a BSD-style license that can be |   2 // Use of this source code is governed by a BSD-style license that can be | 
|   3 // found in the LICENSE file. |   3 // found in the LICENSE file. | 
|   4  |   4  | 
|   5 #include "base/basictypes.h" |  | 
|   6 #include "base/bind.h" |   5 #include "base/bind.h" | 
|   7 #include "base/compiler_specific.h" |   6 #include "base/compiler_specific.h" | 
 |   7 #include "base/macros.h" | 
|   8 #include "base/path_service.h" |   8 #include "base/path_service.h" | 
|   9 #include "base/test/launcher/unit_test_launcher.h" |   9 #include "base/test/launcher/unit_test_launcher.h" | 
|  10 #include "base/test/test_suite.h" |  10 #include "base/test/test_suite.h" | 
|  11 #include "testing/gtest/include/gtest/gtest.h" |  11 #include "testing/gtest/include/gtest/gtest.h" | 
|  12 #include "ui/base/resource/resource_bundle.h" |  12 #include "ui/base/resource/resource_bundle.h" | 
|  13 #include "ui/base/ui_base_paths.h" |  13 #include "ui/base/ui_base_paths.h" | 
|  14 #include "ui/gl/test/gl_surface_test_support.h" |  14 #include "ui/gl/test/gl_surface_test_support.h" | 
|  15  |  15  | 
|  16 #if defined(USE_AURA) |  16 #if defined(USE_AURA) | 
|  17 #include "ui/aura/env.h" |  17 #include "ui/aura/env.h" | 
| (...skipping 29 matching lines...) Expand all  Loading... | 
|  47   DISALLOW_COPY_AND_ASSIGN(ViewTestSuite); |  47   DISALLOW_COPY_AND_ASSIGN(ViewTestSuite); | 
|  48 }; |  48 }; | 
|  49  |  49  | 
|  50 int main(int argc, char** argv) { |  50 int main(int argc, char** argv) { | 
|  51   ViewTestSuite test_suite(argc, argv); |  51   ViewTestSuite test_suite(argc, argv); | 
|  52  |  52  | 
|  53   return base::LaunchUnitTests( |  53   return base::LaunchUnitTests( | 
|  54       argc, argv, base::Bind(&ViewTestSuite::Run, |  54       argc, argv, base::Bind(&ViewTestSuite::Run, | 
|  55                              base::Unretained(&test_suite))); |  55                              base::Unretained(&test_suite))); | 
|  56 } |  56 } | 
| OLD | NEW |