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/path_service.h" | |
8 #include "base/strings/string16.h" | 7 #include "base/strings/string16.h" |
9 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
11 #include "base/time/time.h" | 10 #include "base/time/time.h" |
12 #include "chrome/browser/favicon/favicon_service_factory.h" | 11 #include "chrome/browser/favicon/favicon_service_factory.h" |
13 #include "chrome/browser/history/history_service.h" | 12 #include "chrome/browser/history/history_service.h" |
14 #include "chrome/browser/history/history_service_factory.h" | 13 #include "chrome/browser/history/history_service_factory.h" |
15 #include "chrome/browser/profiles/profile_manager.h" | 14 #include "chrome/browser/profiles/profile_manager.h" |
16 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
17 #include "chrome/browser/ui/browser_tabstrip.h" | 16 #include "chrome/browser/ui/browser_tabstrip.h" |
(...skipping 541 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
559 // Verify we did get the expected favicon. | 558 // Verify we did get the expected favicon. |
560 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), | 559 EXPECT_EQ(0, memcmp(new_icon_bitmap.getPixels(), |
561 valid_icon_bitmap.getPixels(), | 560 valid_icon_bitmap.getPixels(), |
562 new_icon_bitmap.getSize())); | 561 new_icon_bitmap.getSize())); |
563 | 562 |
564 // Make sure the browser deconstructor doesn't have problems. | 563 // Make sure the browser deconstructor doesn't have problems. |
565 browser->tab_strip_model()->CloseAllTabs(); | 564 browser->tab_strip_model()->CloseAllTabs(); |
566 // This is required to prevent the message loop from hanging. | 565 // This is required to prevent the message loop from hanging. |
567 profile()->DestroyHistoryService(); | 566 profile()->DestroyHistoryService(); |
568 } | 567 } |
OLD | NEW |