Commit 9974ce1f authored by tfarina@chromium.org's avatar tfarina@chromium.org

ui: Time to empty the ui/test/ directory.

The remaining pieces in ui/test/ are used only by a unittest in ui/gfx/,
so in this patch we move these files into ui/gfx. This fixes the TODO in
ui/gfx/DEPS that was assigned to Ben.

BUG=None
TEST=ui_unittests
R=tony@chromium.org,ben@chromium.org

Review URL: https://codereview.chromium.org/147803002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247866 0039d316-1c4b-4281-b951-d872f2087c98
parent d9dd735b
......@@ -3,5 +3,4 @@ include_rules = [
"+skia/ext",
"+third_party/angle",
"+third_party/skia",
"+ui/test/ui_unittests_resource.h", # TODO(beng): remove
]
......@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
#include "ui/gfx/icon_util.h"
#include "base/file_util.h"
#include "base/files/scoped_temp_dir.h"
#include "base/memory/scoped_ptr.h"
......@@ -9,11 +11,10 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/gfx/gfx_paths.h"
#include "ui/gfx/icon_util.h"
#include "ui/gfx/icon_util_unittests_resource.h"
#include "ui/gfx/image/image.h"
#include "ui/gfx/image/image_family.h"
#include "ui/gfx/size.h"
#include "ui/test/ui_unittests_resource.h"
namespace {
......
// Microsoft Visual C++ generated resource script.
//
#include "ui_unittests_resource.h"
#include "icon_util_unittests_resource.h"
#define APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
......@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
IDR_MAINFRAME ICON "ui_unittests.ico"
IDR_MAINFRAME ICON "icon_util_unittests.ico"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Copyright 2014 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_rules = [
"+ui/base",
"+ui/gfx",
]
......@@ -190,11 +190,11 @@
}],
['OS == "win"', {
'sources': [
'test/ui_unittests.rc',
'base/dragdrop/os_exchange_data_win_unittest.cc',
'base/win/hwnd_subclass_unittest.cc',
'gfx/font_fallback_win_unittest.cc',
'gfx/icon_util_unittest.cc',
'gfx/icon_util_unittests.rc',
'gfx/platform_font_win_unittest.cc',
],
'include_dirs': [
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment