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

Side by Side Diff: chrome/browser/favicon/content_favicon_driver_browsertest.cc

Issue 2014803002: Move DownloadControllerAndroid from content/ to chrome/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix failing tests/bugs Created 4 years, 6 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 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 "components/favicon/content/content_favicon_driver.h" 5 #include "components/favicon/content/content_favicon_driver.h"
6 6
7 #include "base/location.h" 7 #include "base/location.h"
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "base/run_loop.h" 10 #include "base/run_loop.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 if (request->load_flags() & net::LOAD_BYPASS_CACHE) 72 if (request->load_flags() & net::LOAD_BYPASS_CACHE)
73 bypassed_cache_ = true; 73 bypassed_cache_ = true;
74 } 74 }
75 } 75 }
76 76
77 void DownloadStarting( 77 void DownloadStarting(
78 net::URLRequest* request, 78 net::URLRequest* request,
79 content::ResourceContext* resource_context, 79 content::ResourceContext* resource_context,
80 int child_id, 80 int child_id,
81 int route_id, 81 int route_id,
82 int request_id,
83 bool is_content_initiated, 82 bool is_content_initiated,
84 bool must_download, 83 bool must_download,
85 ScopedVector<content::ResourceThrottle>* throttles) override {} 84 ScopedVector<content::ResourceThrottle>* throttles) override {}
86 85
87 private: 86 private:
88 GURL url_; 87 GURL url_;
89 bool was_requested_; 88 bool was_requested_;
90 bool bypassed_cache_; 89 bool bypassed_cache_;
91 90
92 DISALLOW_COPY_AND_ASSIGN(TestResourceDispatcherHostDelegate); 91 DISALLOW_COPY_AND_ASSIGN(TestResourceDispatcherHostDelegate);
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 239
241 // A reload ignoring the cache should refetch the favicon from the website. 240 // A reload ignoring the cache should refetch the favicon from the website.
242 { 241 {
243 PendingTaskWaiter waiter(web_contents(), this); 242 PendingTaskWaiter waiter(web_contents(), this);
244 chrome::ExecuteCommand(browser(), IDC_RELOAD_BYPASSING_CACHE); 243 chrome::ExecuteCommand(browser(), IDC_RELOAD_BYPASSING_CACHE);
245 waiter.Wait(); 244 waiter.Wait();
246 } 245 }
247 ASSERT_TRUE(delegate->was_requested()); 246 ASSERT_TRUE(delegate->was_requested());
248 EXPECT_TRUE(delegate->bypassed_cache()); 247 EXPECT_TRUE(delegate->bypassed_cache());
249 } 248 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698