OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/favicon/favicon_tab_helper.h" | 5 #include "chrome/browser/favicon/favicon_tab_helper.h" |
6 | 6 |
7 #include "base/memory/weak_ptr.h" | 7 #include "base/memory/weak_ptr.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/app/chrome_command_ids.h" | 9 #include "chrome/app/chrome_command_ids.h" |
10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
11 #include "chrome/browser/favicon/favicon_handler.h" | |
12 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
13 #include "chrome/browser/ui/browser_commands.h" | 12 #include "chrome/browser/ui/browser_commands.h" |
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 13 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
15 #include "chrome/test/base/in_process_browser_test.h" | 14 #include "chrome/test/base/in_process_browser_test.h" |
16 #include "chrome/test/base/ui_test_utils.h" | 15 #include "chrome/test/base/ui_test_utils.h" |
| 16 #include "components/favicon/core/browser/favicon_handler.h" |
17 #include "content/public/browser/notification_observer.h" | 17 #include "content/public/browser/notification_observer.h" |
18 #include "content/public/browser/notification_registrar.h" | 18 #include "content/public/browser/notification_registrar.h" |
19 #include "content/public/browser/notification_types.h" | 19 #include "content/public/browser/notification_types.h" |
20 #include "content/public/browser/resource_dispatcher_host.h" | 20 #include "content/public/browser/resource_dispatcher_host.h" |
21 #include "content/public/browser/resource_dispatcher_host_delegate.h" | 21 #include "content/public/browser/resource_dispatcher_host_delegate.h" |
22 #include "net/base/load_flags.h" | 22 #include "net/base/load_flags.h" |
23 #include "net/test/spawned_test_server/spawned_test_server.h" | 23 #include "net/test/spawned_test_server/spawned_test_server.h" |
24 #include "net/url_request/url_request.h" | 24 #include "net/url_request/url_request.h" |
25 #include "url/url_constants.h" | 25 #include "url/url_constants.h" |
26 | 26 |
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
219 | 219 |
220 // A reload ignoring the cache should refetch the favicon from the website. | 220 // A reload ignoring the cache should refetch the favicon from the website. |
221 { | 221 { |
222 PendingTaskWaiter waiter(web_contents(), this); | 222 PendingTaskWaiter waiter(web_contents(), this); |
223 chrome::ExecuteCommand(browser(), IDC_RELOAD_IGNORING_CACHE); | 223 chrome::ExecuteCommand(browser(), IDC_RELOAD_IGNORING_CACHE); |
224 waiter.Wait(); | 224 waiter.Wait(); |
225 } | 225 } |
226 ASSERT_TRUE(delegate->was_requested()); | 226 ASSERT_TRUE(delegate->was_requested()); |
227 EXPECT_TRUE(delegate->bypassed_cache()); | 227 EXPECT_TRUE(delegate->bypassed_cache()); |
228 } | 228 } |
OLD | NEW |