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

Side by Side Diff: chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm

Issue 1319473014: Introduce TabRestoreServiceClient and //chrome implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Response to review Created 5 years, 3 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
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 #import <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 #include <vector> 6 #include <vector>
7 7
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/strings/sys_string_conversions.h" 11 #include "base/strings/sys_string_conversions.h"
12 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
13 #include "chrome/app/chrome_command_ids.h" 13 #include "chrome/app/chrome_command_ids.h"
14 #include "chrome/browser/sessions/chrome_tab_restore_service_client.h"
14 #include "chrome/browser/sessions/persistent_tab_restore_service.h" 15 #include "chrome/browser/sessions/persistent_tab_restore_service.h"
15 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h" 16 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
16 #include "chrome/browser/ui/cocoa/history_menu_bridge.h" 17 #include "chrome/browser/ui/cocoa/history_menu_bridge.h"
17 #include "chrome/test/base/testing_profile.h" 18 #include "chrome/test/base/testing_profile.h"
18 #include "components/favicon_base/favicon_types.h" 19 #include "components/favicon_base/favicon_types.h"
19 #include "components/sessions/serialized_navigation_entry_test_helper.h" 20 #include "components/sessions/serialized_navigation_entry_test_helper.h"
20 #include "testing/gmock/include/gmock/gmock.h" 21 #include "testing/gmock/include/gmock/gmock.h"
21 #include "testing/gtest/include/gtest/gtest.h" 22 #include "testing/gtest/include/gtest/gtest.h"
22 #import "testing/gtest_mac.h" 23 #import "testing/gtest_mac.h"
23 #include "third_party/skia/include/core/SkBitmap.h" 24 #include "third_party/skia/include/core/SkBitmap.h"
24 #include "ui/gfx/codec/png_codec.h" 25 #include "ui/gfx/codec/png_codec.h"
25 26
26 namespace { 27 namespace {
27 28
28 class MockTRS : public PersistentTabRestoreService { 29 class MockTRS : public PersistentTabRestoreService {
29 public: 30 public:
30 MockTRS(Profile* profile) : PersistentTabRestoreService(profile, NULL) {} 31 MockTRS(Profile* profile)
32 : PersistentTabRestoreService(
33 profile,
34 make_scoped_ptr(new ChromeTabRestoreServiceClient(profile)),
35 nullptr) {}
31 MOCK_CONST_METHOD0(entries, const TabRestoreService::Entries&()); 36 MOCK_CONST_METHOD0(entries, const TabRestoreService::Entries&());
32 }; 37 };
33 38
34 class MockBridge : public HistoryMenuBridge { 39 class MockBridge : public HistoryMenuBridge {
35 public: 40 public:
36 MockBridge(Profile* profile) 41 MockBridge(Profile* profile)
37 : HistoryMenuBridge(profile), 42 : HistoryMenuBridge(profile),
38 menu_([[NSMenu alloc] initWithTitle:@"History"]) {} 43 menu_([[NSMenu alloc] initWithTitle:@"History"]) {}
39 44
40 NSMenu* HistoryMenu() override { return menu_.get(); } 45 NSMenu* HistoryMenu() override { return menu_.get(); }
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
347 image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap); 352 image_result.image = gfx::Image::CreateFrom1xBitmap(bitmap);
348 GotFaviconData(&item, image_result); 353 GotFaviconData(&item, image_result);
349 354
350 // Make sure the callback works. 355 // Make sure the callback works.
351 EXPECT_FALSE(item.icon_requested); 356 EXPECT_FALSE(item.icon_requested);
352 EXPECT_TRUE(item.icon.get()); 357 EXPECT_TRUE(item.icon.get());
353 EXPECT_TRUE([item.menu_item image]); 358 EXPECT_TRUE([item.menu_item image]);
354 } 359 }
355 360
356 } // namespace 361 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698