ui/gfx/image/image_unittest.cc - Issue 10778019: Remove gfx_unittests target in favor of ui_unittests

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ui/gfx/image/image_unittest.cc

Issue 10778019: Remove gfx_unittests target in favor of ui_unittests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « tools/valgrind/chrome_tests.py ('k') | ui/ui.gyp » ('j') | no next file with comments »

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 "testing/gtest/include/gtest/gtest.h"	5 #include "testing/gtest/include/gtest/gtest.h"

6 #include "ui/gfx/image/image.h"	6 #include "ui/gfx/image/image.h"

7 #include "ui/gfx/image/image_skia.h"	7 #include "ui/gfx/image/image_skia.h"

8 #include "ui/gfx/image/image_unittest_util.h"	8 #include "ui/gfx/image/image_unittest_util.h"

9	9

10 #if defined(TOOLKIT_GTK)	10 #if defined(TOOLKIT_GTK)

(...skipping 300 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
311 gfx::Image image;	311 gfx::Image image;

312 {	312 {

313 SkBitmap bitmap(gt::CreateBitmap(10, 10));	313 SkBitmap bitmap(gt::CreateBitmap(10, 10));

314 EXPECT_TRUE(!bitmap.isNull());	314 EXPECT_TRUE(!bitmap.isNull());

315 image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));	315 image = gfx::Image(gfx::ImageSkiaRep(bitmap, ui::SCALE_FACTOR_100P));

316 }	316 }

317 EXPECT_TRUE(!image.ToSkBitmap()->isNull());	317 EXPECT_TRUE(!image.ToSkBitmap()->isNull());

318 }	318 }

319	319

320 // Integration tests with UI toolkit frameworks require linking against the	320 // Integration tests with UI toolkit frameworks require linking against the

321 // Views library and cannot be here (gfx_unittests doesn't include it). They	321 // Views library and cannot be here (ui_unittests doesn't include it). They

322 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.	322 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.

323	323

324 } // namespace	324 } // namespace

OLD	NEW