diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:40:19 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 20:40:19 +0000 |
commit | fd8c38a198841fac285bfbf6edc0fd30c0027d6f (patch) | |
tree | 6b33cef69cba50f427f57621d209be6df764a395 /ui/test/test_suite.cc | |
parent | 8cf18437002bf8d7396f95515eba91d262452751 (diff) | |
download | chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.zip chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.tar.gz chromium_src-fd8c38a198841fac285bfbf6edc0fd30c0027d6f.tar.bz2 |
ui: Kill run_ui_unittests target.
After r246620 nobody needs or should include ui/test/test_suite.h. That
allow us to concentrate it in ui/base/.
We move the run_all_unittests.cc into ui/base/test and at the same time
fold test_suite.* into run_all_unittests.cc and rename UITestSuite to
UIBaseTestSuite.
BUG=144345,299841
TEST=ui_unittests
R=tony@chromium.org,ben@chromium.org
TBR=ben
Review URL: https://codereview.chromium.org/142793006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247141 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/test/test_suite.cc')
-rw-r--r-- | ui/test/test_suite.cc | 74 |
1 files changed, 0 insertions, 74 deletions
diff --git a/ui/test/test_suite.cc b/ui/test/test_suite.cc deleted file mode 100644 index c744d6e..0000000 --- a/ui/test/test_suite.cc +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright (c) 2012 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 "ui/test/test_suite.h" - -#include "base/files/file_path.h" -#include "base/path_service.h" -#include "build/build_config.h" -#include "ui/base/resource/resource_bundle.h" -#include "ui/base/ui_base_paths.h" -#include "ui/gfx/gfx_paths.h" - -#if defined(OS_ANDROID) -#include "base/android/jni_android.h" -#include "ui/base/android/ui_base_jni_registrar.h" -#include "ui/gfx/android/gfx_jni_registrar.h" -#endif - -#if defined(OS_MACOSX) && !defined(OS_IOS) -#include "base/mac/bundle_locations.h" -#endif - -namespace ui { -namespace test { - -UITestSuite::UITestSuite(int argc, char** argv) : base::TestSuite(argc, argv) {} - -void UITestSuite::Initialize() { - base::TestSuite::Initialize(); - -#if defined(OS_ANDROID) - // Register JNI bindings for android. - gfx::android::RegisterJni(base::android::AttachCurrentThread()); - ui::android::RegisterJni(base::android::AttachCurrentThread()); -#endif - - ui::RegisterPathProvider(); - gfx::RegisterPathProvider(); - -#if defined(OS_MACOSX) && !defined(OS_IOS) - // Look in the framework bundle for resources. - // TODO(port): make a resource bundle for non-app exes. What's done here - // isn't really right because this code needs to depend on chrome_dll - // being built. This is inappropriate in app. - base::FilePath path; - PathService::Get(base::DIR_EXE, &path); -#if defined(GOOGLE_CHROME_BUILD) - path = path.AppendASCII("Google Chrome Framework.framework"); -#elif defined(CHROMIUM_BUILD) - path = path.AppendASCII("Chromium Framework.framework"); -#else -#error Unknown branding -#endif - base::mac::SetOverrideFrameworkBundlePath(path); -#endif // defined(OS_MACOSX) && !defined(OS_IOS) - - // TODO(tfarina): This loads chrome_100_percent.pak and thus introduces a - // dependency on chrome/, we don't want that here, so change this to - // InitSharedInstanceWithPakPath(). - ui::ResourceBundle::InitSharedInstanceWithLocale("en-US", NULL); -} - -void UITestSuite::Shutdown() { - ui::ResourceBundle::CleanupSharedInstance(); - -#if defined(OS_MACOSX) && !defined(OS_IOS) - base::mac::SetOverrideFrameworkBundle(NULL); -#endif - base::TestSuite::Shutdown(); -} - -} // namespace test -} // namespace ui |