| 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 "chrome/browser/favicon/select_favicon_frames.h" | 5 #include "chrome/browser/history/select_favicon_frames.h" |
| 6 | 6 |
| 7 #include "ui/base/layout.h" | 7 #include "ui/base/layout.h" |
| 8 #include "ui/gfx/image/image_skia.h" | 8 #include "ui/gfx/image/image_skia.h" |
| 9 #include "testing/gtest/include/gtest/gtest.h" | 9 #include "testing/gtest/include/gtest/gtest.h" |
| 10 #include "third_party/skia/include/core/SkBitmap.h" | 10 #include "third_party/skia/include/core/SkBitmap.h" |
| 11 #include "third_party/skia/include/core/SkColor.h" | 11 #include "third_party/skia/include/core/SkColor.h" |
| 12 | 12 |
| 13 using std::vector; | 13 using std::vector; |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 | 221 |
| 222 float score2; | 222 float score2; |
| 223 vector<SkBitmap> bitmaps2; | 223 vector<SkBitmap> bitmaps2; |
| 224 bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24)); | 224 bitmaps2.push_back(MakeBitmap(SK_ColorGREEN, 24, 24)); |
| 225 SelectFaviconFrames(bitmaps2, Scale1x(), 16, &score2); | 225 SelectFaviconFrames(bitmaps2, Scale1x(), 16, &score2); |
| 226 | 226 |
| 227 EXPECT_GT(score2, score1); | 227 EXPECT_GT(score2, score1); |
| 228 } | 228 } |
| 229 | 229 |
| 230 } | 230 } |
| OLD | NEW |