| 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 "components/favicon/core/favicon_handler.h" | 5 #include "components/favicon/core/favicon_handler.h" |
| 6 | 6 |
| 7 #include<set> | 7 #include<set> |
| 8 #include<vector> | 8 #include<vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 << "should never be called in tests."; | 222 << "should never be called in tests."; |
| 223 return -1; | 223 return -1; |
| 224 } | 224 } |
| 225 | 225 |
| 226 bool IsOffTheRecord() override { return false; } | 226 bool IsOffTheRecord() override { return false; } |
| 227 | 227 |
| 228 bool IsBookmarked(const GURL& url) override { return false; } | 228 bool IsBookmarked(const GURL& url) override { return false; } |
| 229 | 229 |
| 230 GURL GetActiveURL() override { return url_; } | 230 GURL GetActiveURL() override { return url_; } |
| 231 | 231 |
| 232 bool GetActiveFaviconValidity() override { return favicon_validity_; } | 232 bool GetActiveFaviconValidity() { return favicon_validity_; } |
| 233 | 233 |
| 234 void SetActiveFaviconValidity(bool favicon_validity) override { | 234 void SetActiveFaviconValidity(bool favicon_validity) override { |
| 235 favicon_validity_ = favicon_validity; | 235 favicon_validity_ = favicon_validity; |
| 236 } | 236 } |
| 237 | 237 |
| 238 GURL GetActiveFaviconURL() override { return favicon_url_; } | 238 GURL GetActiveFaviconURL() override { return favicon_url_; } |
| 239 | 239 |
| 240 void SetActiveFaviconURL(const GURL& favicon_url) override { | 240 void SetActiveFaviconURL(const GURL& favicon_url) override { |
| 241 favicon_url_ = favicon_url; | 241 favicon_url_ = favicon_url; |
| 242 } | 242 } |
| (...skipping 1507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1750 EXPECT_FALSE(driver1.update_active_favicon()); | 1750 EXPECT_FALSE(driver1.update_active_favicon()); |
| 1751 EXPECT_EQ(3u, driver1.num_favicon_available()); | 1751 EXPECT_EQ(3u, driver1.num_favicon_available()); |
| 1752 } | 1752 } |
| 1753 | 1753 |
| 1754 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse, | 1754 INSTANTIATE_TEST_CASE_P(FaviconHandlerTestActiveFaviconValidityTrueOrFalse, |
| 1755 FaviconHandlerActiveFaviconValidityParamTest, | 1755 FaviconHandlerActiveFaviconValidityParamTest, |
| 1756 ::testing::Bool()); | 1756 ::testing::Bool()); |
| 1757 | 1757 |
| 1758 } // namespace | 1758 } // namespace |
| 1759 } // namespace favicon | 1759 } // namespace favicon |
| OLD | NEW |