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

Side by Side Diff: components/favicon/core/favicon_handler_unittest.cc

Issue 1546143002: Switch to standard integer types in components/, part 1 of 4. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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
« no previous file with comments | « components/favicon/core/favicon_handler.h ('k') | components/favicon/core/favicon_service.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "components/favicon/core/favicon_handler.h" 5 #include "components/favicon/core/favicon_handler.h"
6 6
7 #include<set> 7 #include<set>
8 #include<vector> 8 #include<vector>
9 9
10 #include <stddef.h>
11
12 #include "base/macros.h"
10 #include "base/memory/scoped_ptr.h" 13 #include "base/memory/scoped_ptr.h"
11 #include "components/favicon/core/favicon_driver.h" 14 #include "components/favicon/core/favicon_driver.h"
12 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 16 #include "third_party/skia/include/core/SkBitmap.h"
14 #include "ui/base/layout.h" 17 #include "ui/base/layout.h"
15 #include "ui/gfx/codec/png_codec.h" 18 #include "ui/gfx/codec/png_codec.h"
16 #include "ui/gfx/favicon_size.h" 19 #include "ui/gfx/favicon_size.h"
17 #include "ui/gfx/image/image.h" 20 #include "ui/gfx/image/image.h"
18 21
19 namespace favicon { 22 namespace favicon {
(...skipping 1691 matching lines...) Expand 10 before | Expand all | Expand 10 after
1711 handler1.download_handler()->Reset(); 1714 handler1.download_handler()->Reset();
1712 1715
1713 // Verify icon2 has been saved into history. 1716 // Verify icon2 has been saved into history.
1714 EXPECT_EQ(kSourceIconURLs[1].icon_url, handler1.history_handler()->icon_url_); 1717 EXPECT_EQ(kSourceIconURLs[1].icon_url, handler1.history_handler()->icon_url_);
1715 EXPECT_EQ(gfx::Size(actual_size2, actual_size2), 1718 EXPECT_EQ(gfx::Size(actual_size2, actual_size2),
1716 handler1.history_handler()->size_); 1719 handler1.history_handler()->size_);
1717 } 1720 }
1718 1721
1719 } // namespace 1722 } // namespace
1720 } // namespace favicon 1723 } // namespace favicon
OLDNEW
« no previous file with comments | « components/favicon/core/favicon_handler.h ('k') | components/favicon/core/favicon_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698