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/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/message_loop/message_loop.h" |
8 #include "base/run_loop.h" | 9 #include "base/run_loop.h" |
9 #include "base/strings/string16.h" | 10 #include "base/strings/string16.h" |
10 #include "base/strings/string_util.h" | 11 #include "base/strings/string_util.h" |
11 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
12 #include "base/time/time.h" | 13 #include "base/time/time.h" |
13 #include "build/build_config.h" | 14 #include "build/build_config.h" |
14 #include "chrome/browser/favicon/favicon_service_factory.h" | 15 #include "chrome/browser/favicon/favicon_service_factory.h" |
15 #include "chrome/browser/history/history_service_factory.h" | 16 #include "chrome/browser/history/history_service_factory.h" |
16 #include "chrome/browser/profiles/profile_manager.h" | 17 #include "chrome/browser/profiles/profile_manager.h" |
17 #include "chrome/browser/ui/browser.h" | 18 #include "chrome/browser/ui/browser.h" |
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
556 valid_icon_bitmap.getPixels(), | 557 valid_icon_bitmap.getPixels(), |
557 default_icon_bitmap.getSize())); | 558 default_icon_bitmap.getSize())); |
558 // Verify we did get the expected favicon. | 559 // Verify we did get the expected favicon. |
559 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), | 560 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), |
560 valid_icon_bitmap.getPixels(), | 561 valid_icon_bitmap.getPixels(), |
561 new_icon_bitmap.getSize())); | 562 new_icon_bitmap.getSize())); |
562 | 563 |
563 // Make sure the browser deconstructor doesn't have problems. | 564 // Make sure the browser deconstructor doesn't have problems. |
564 browser->tab_strip_model()->CloseAllTabs(); | 565 browser->tab_strip_model()->CloseAllTabs(); |
565 } | 566 } |
OLD | NEW |