Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2788)

Unified Diff: chrome/browser/tab_contents/thumbnail_generator_unittest.cc

Issue 7465041: GTTF: Use a fresh TestingBrowserProcess for each test, part #4 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: should work Created 9 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/tab_contents/thumbnail_generator_unittest.cc
diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
index 435d7db854b22786476d1941e2cb67d137370151..c27dc72edfe7c6658b86732761853b9f17cecf55 100644
--- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
+++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/history/top_sites.h"
#include "chrome/browser/tab_contents/thumbnail_generator.h"
#include "chrome/common/render_messages.h"
+#include "chrome/test/testing_browser_process_test.h"
#include "chrome/test/testing_profile.h"
#include "content/browser/renderer_host/backing_store_manager.h"
#include "content/browser/renderer_host/backing_store_skia.h"
@@ -53,7 +54,7 @@ class TestRenderWidgetHostViewWithBackingStoreSkia
DISALLOW_COPY_AND_ASSIGN(TestRenderWidgetHostViewWithBackingStoreSkia);
};
-class ThumbnailGeneratorTest : public testing::Test {
+class ThumbnailGeneratorTest : public TestingBrowserProcessTest {
public:
ThumbnailGeneratorTest() {
profile_.reset(new TestingProfile());
@@ -207,12 +208,15 @@ TEST_F(ThumbnailGeneratorTest, DiscardBackingStore) {
#endif // !defined(OS_MAC)
-TEST(ThumbnailGeneratorSimpleTest, CalculateBoringScore_Empty) {
+class ThumbnailGeneratorSimpleTest : public TestingBrowserProcessTest {
sky 2011/07/28 00:28:03 nit: typedef TestingBrowserProcessTest ThumbnailGe
+};
+
+TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_Empty) {
SkBitmap bitmap;
EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(&bitmap));
}
-TEST(ThumbnailGeneratorSimpleTest, CalculateBoringScore_SingleColor) {
+TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_SingleColor) {
const SkColor kBlack = SkColorSetRGB(0, 0, 0);
const gfx::Size kSize(20, 10);
gfx::CanvasSkia canvas(kSize.width(), kSize.height(), true);
@@ -224,7 +228,7 @@ TEST(ThumbnailGeneratorSimpleTest, CalculateBoringScore_SingleColor) {
EXPECT_DOUBLE_EQ(1.0, ThumbnailGenerator::CalculateBoringScore(&bitmap));
}
-TEST(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) {
+TEST_F(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) {
const SkColor kBlack = SkColorSetRGB(0, 0, 0);
const SkColor kWhite = SkColorSetRGB(0xFF, 0xFF, 0xFF);
const gfx::Size kSize(20, 10);
@@ -242,7 +246,7 @@ TEST(ThumbnailGeneratorSimpleTest, CalculateBoringScore_TwoColors) {
EXPECT_DOUBLE_EQ(0.5, ThumbnailGenerator::CalculateBoringScore(&bitmap));
}
-TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) {
+TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) {
// The input bitmap is vertically long.
gfx::CanvasSkia canvas(40, 90, true);
const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false);
@@ -258,7 +262,7 @@ TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_TallerThanWide) {
EXPECT_EQ(ThumbnailGenerator::kTallerThanWide, clip_result);
}
-TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_WiderThanTall) {
+TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_WiderThanTall) {
// The input bitmap is horizontally long.
gfx::CanvasSkia canvas(90, 40, true);
const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false);
@@ -274,7 +278,7 @@ TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_WiderThanTall) {
EXPECT_EQ(ThumbnailGenerator::kWiderThanTall, clip_result);
}
-TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NotClipped) {
+TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NotClipped) {
// The input bitmap is square.
gfx::CanvasSkia canvas(40, 40, true);
const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false);
@@ -290,7 +294,7 @@ TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NotClipped) {
EXPECT_EQ(ThumbnailGenerator::kNotClipped, clip_result);
}
-TEST(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NonSquareOutput) {
+TEST_F(ThumbnailGeneratorSimpleTest, GetClippedBitmap_NonSquareOutput) {
// The input bitmap is square.
gfx::CanvasSkia canvas(40, 40, true);
const SkBitmap bitmap = skia::GetTopDevice(canvas)->accessBitmap(false);
@@ -343,7 +347,7 @@ class MockTopSites : public history::TopSites {
std::map<std::string, ThumbnailScore> known_url_map_;
};
-TEST(ThumbnailGeneratorSimpleTest, ShouldUpdateThumbnail) {
+TEST_F(ThumbnailGeneratorSimpleTest, ShouldUpdateThumbnail) {
const GURL kGoodURL("http://www.google.com/");
const GURL kBadURL("chrome://newtab");

Powered by Google App Engine
This is Rietveld 408576698