| 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/ui/cocoa/history_menu_bridge.h" | 5 #include "chrome/browser/ui/cocoa/history_menu_bridge.h" | 
| 6 | 6 | 
| 7 #import <Cocoa/Cocoa.h> | 7 #import <Cocoa/Cocoa.h> | 
| 8 | 8 | 
| 9 #include <initializer_list> | 9 #include <initializer_list> | 
| 10 #include <memory> | 10 #include <memory> | 
| 11 #include <vector> | 11 #include <vector> | 
| 12 | 12 | 
| 13 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" | 
| 14 #include "base/memory/ref_counted_memory.h" | 14 #include "base/memory/ref_counted_memory.h" | 
| 15 #include "base/strings/string_util.h" | 15 #include "base/strings/string_util.h" | 
| 16 #include "base/strings/sys_string_conversions.h" | 16 #include "base/strings/sys_string_conversions.h" | 
| 17 #include "base/strings/utf_string_conversions.h" | 17 #include "base/strings/utf_string_conversions.h" | 
| 18 #include "chrome/app/chrome_command_ids.h" | 18 #include "chrome/app/chrome_command_ids.h" | 
| 19 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" | 19 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h" | 
| 20 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" | 20 #include "chrome/browser/ui/cocoa/test/cocoa_profile_test.h" | 
| 21 #include "chrome/test/base/testing_profile.h" | 21 #include "chrome/test/base/testing_profile.h" | 
| 22 #include "components/favicon_base/favicon_types.h" | 22 #include "components/favicon_base/favicon_types.h" | 
| 23 #include "components/sessions/core/persistent_tab_restore_service.h" | 23 #include "components/sessions/core/persistent_tab_restore_service.h" | 
| 24 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" | 24 #include "components/sessions/core/serialized_navigation_entry_test_helper.h" | 
| 25 #include "testing/gmock/include/gmock/gmock.h" | 25 #include "testing/gmock/include/gmock/gmock.h" | 
| 26 #include "testing/gtest/include/gtest/gtest.h" | 26 #include "testing/gtest/include/gtest/gtest.h" | 
| 27 #import "testing/gtest_mac.h" | 27 #import "testing/gtest_mac.h" | 
| 28 #include "third_party/skia/include/core/SkBitmap.h" | 28 #include "third_party/skia/include/core/SkBitmap.h" | 
| 29 #include "ui/gfx/codec/png_codec.h" | 29 #include "ui/gfx/codec/png_codec.h" | 
| 30 | 30 | 
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 362   image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap); | 362   image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap); | 
| 363   GotFaviconData(&item, image_result); | 363   GotFaviconData(&item, image_result); | 
| 364 | 364 | 
| 365   // Make sure the callback works. | 365   // Make sure the callback works. | 
| 366   EXPECT_FALSE(item.icon_requested); | 366   EXPECT_FALSE(item.icon_requested); | 
| 367   EXPECT_TRUE(item.icon.get()); | 367   EXPECT_TRUE(item.icon.get()); | 
| 368   EXPECT_TRUE([item.menu_item image]); | 368   EXPECT_TRUE([item.menu_item image]); | 
| 369 } | 369 } | 
| 370 | 370 | 
| 371 }  // namespace | 371 }  // namespace | 
| OLD | NEW | 
|---|