| 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/toolbar/back_forward_menu_model.h" | 5 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h" |
| 6 | 6 |
| 7 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "base/time/time.h" | 10 #include "base/time/time.h" |
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 492 EXPECT_EQ(ASCIIToUTF16("A &&&& B"), back_model->GetLabelAt(1)); | 492 EXPECT_EQ(ASCIIToUTF16("A &&&& B"), back_model->GetLabelAt(1)); |
| 493 EXPECT_EQ(ASCIIToUTF16("A &&&&&& B"), back_model->GetLabelAt(0)); | 493 EXPECT_EQ(ASCIIToUTF16("A &&&&&& B"), back_model->GetLabelAt(0)); |
| 494 #endif // defined(OS_MACOSX) | 494 #endif // defined(OS_MACOSX) |
| 495 } | 495 } |
| 496 | 496 |
| 497 // Test asynchronous loading of favicon from history service. | 497 // Test asynchronous loading of favicon from history service. |
| 498 TEST_F(BackFwdMenuModelTest, FaviconLoadTest) { | 498 TEST_F(BackFwdMenuModelTest, FaviconLoadTest) { |
| 499 ASSERT_TRUE(profile()->CreateHistoryService(true, false)); | 499 ASSERT_TRUE(profile()->CreateHistoryService(true, false)); |
| 500 profile()->CreateFaviconService(); | 500 profile()->CreateFaviconService(); |
| 501 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); | 501 Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop()); |
| 502 scoped_ptr<Browser> browser( | 502 scoped_ptr<Browser> browser = |
| 503 chrome::CreateBrowserWithTestWindowForParams(&native_params)); | 503 chrome::CreateBrowserWithTestWindowForParams(&native_params); |
| 504 FaviconDelegate favicon_delegate; | 504 FaviconDelegate favicon_delegate; |
| 505 | 505 |
| 506 BackForwardMenuModel back_model( | 506 BackForwardMenuModel back_model( |
| 507 browser.get(), BackForwardMenuModel::BACKWARD_MENU); | 507 browser.get(), BackForwardMenuModel::BACKWARD_MENU); |
| 508 back_model.set_test_web_contents(controller().GetWebContents()); | 508 back_model.set_test_web_contents(controller().GetWebContents()); |
| 509 back_model.SetMenuModelDelegate(&favicon_delegate); | 509 back_model.SetMenuModelDelegate(&favicon_delegate); |
| 510 | 510 |
| 511 SkBitmap new_icon_bitmap(CreateBitmap(SK_ColorRED)); | 511 SkBitmap new_icon_bitmap(CreateBitmap(SK_ColorRED)); |
| 512 | 512 |
| 513 GURL url1 = GURL("http://www.a.com/1"); | 513 GURL url1 = GURL("http://www.a.com/1"); |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 // Verify we did get the expected favicon. | 557 // Verify we did get the expected favicon. |
| 558 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), | 558 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), |
| 559 valid_icon_bitmap.getPixels(), | 559 valid_icon_bitmap.getPixels(), |
| 560 new_icon_bitmap.getSize())); | 560 new_icon_bitmap.getSize())); |
| 561 | 561 |
| 562 // Make sure the browser deconstructor doesn't have problems. | 562 // Make sure the browser deconstructor doesn't have problems. |
| 563 browser->tab_strip_model()->CloseAllTabs(); | 563 browser->tab_strip_model()->CloseAllTabs(); |
| 564 // This is required to prevent the message loop from hanging. | 564 // This is required to prevent the message loop from hanging. |
| 565 profile()->DestroyHistoryService(); | 565 profile()->DestroyHistoryService(); |
| 566 } | 566 } |
| OLD | NEW |