OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/search/suggestions/image_fetcher_impl.h" | 5 #include "components/image_fetcher/image_fetcher_impl.h" |
6 | 6 |
7 #include <memory> | 7 #include <memory> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "base/memory/ptr_util.h" |
12 #include "base/run_loop.h" | 13 #include "base/run_loop.h" |
13 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/browser/search/suggestions/image_decoder_impl.h" |
14 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/test/base/in_process_browser_test.h" | 17 #include "chrome/test/base/in_process_browser_test.h" |
16 #include "components/image_fetcher/image_fetcher_delegate.h" | 18 #include "components/image_fetcher/image_fetcher_delegate.h" |
17 #include "net/test/embedded_test_server/embedded_test_server.h" | 19 #include "net/test/embedded_test_server/embedded_test_server.h" |
18 #include "testing/gtest/include/gtest/gtest.h" | 20 #include "testing/gtest/include/gtest/gtest.h" |
19 #include "ui/gfx/image/image.h" | 21 #include "ui/gfx/image/image.h" |
20 #include "url/gurl.h" | 22 #include "url/gurl.h" |
21 | 23 |
22 class SkBitmap; | |
23 | |
24 using image_fetcher::ImageFetcher; | 24 using image_fetcher::ImageFetcher; |
| 25 using image_fetcher::ImageFetcherImpl; |
25 using image_fetcher::ImageFetcherDelegate; | 26 using image_fetcher::ImageFetcherDelegate; |
26 | 27 |
27 namespace suggestions { | 28 namespace suggestions { |
28 | 29 |
29 namespace { | 30 namespace { |
30 | 31 |
31 const char kTestUrl[] = "http://go.com/"; | 32 const char kTestUrl[] = "http://go.com/"; |
32 const char kTestImagePath[] = "/image_decoding/droids.png"; | 33 const char kTestImagePath[] = "/image_decoding/droids.png"; |
33 const char kInvalidImagePath[] = "/DOESNOTEXIST"; | 34 const char kInvalidImagePath[] = "/DOESNOTEXIST"; |
34 | 35 |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
68 test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); | 69 test_server_.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot)); |
69 } | 70 } |
70 | 71 |
71 void SetUpInProcessBrowserTestFixture() override { | 72 void SetUpInProcessBrowserTestFixture() override { |
72 ASSERT_TRUE(test_server_.Start()); | 73 ASSERT_TRUE(test_server_.Start()); |
73 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); | 74 InProcessBrowserTest::SetUpInProcessBrowserTestFixture(); |
74 } | 75 } |
75 | 76 |
76 ImageFetcherImpl* CreateImageFetcher() { | 77 ImageFetcherImpl* CreateImageFetcher() { |
77 ImageFetcherImpl* fetcher = | 78 ImageFetcherImpl* fetcher = |
78 new ImageFetcherImpl(browser()->profile()->GetRequestContext()); | 79 new ImageFetcherImpl( |
| 80 base::MakeUnique<suggestions::ImageDecoderImpl>(), |
| 81 browser()->profile()->GetRequestContext()); |
79 fetcher->SetImageFetcherDelegate(&delegate_); | 82 fetcher->SetImageFetcherDelegate(&delegate_); |
80 return fetcher; | 83 return fetcher; |
81 } | 84 } |
82 | 85 |
83 void OnImageAvailable(base::RunLoop* loop, | 86 void OnImageAvailable(base::RunLoop* loop, |
84 const std::string& id, | 87 const std::string& id, |
85 const gfx::Image& image) { | 88 const gfx::Image& image) { |
86 if (!image.IsEmpty()) { | 89 if (!image.IsEmpty()) { |
87 num_callback_valid_called_++; | 90 num_callback_valid_called_++; |
88 } else { | 91 } else { |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 GURL invalid_image_url(test_server_.GetURL(kInvalidImagePath).spec()); | 142 GURL invalid_image_url(test_server_.GetURL(kInvalidImagePath).spec()); |
140 StartOrQueueNetworkRequestHelper(invalid_image_url); | 143 StartOrQueueNetworkRequestHelper(invalid_image_url); |
141 | 144 |
142 EXPECT_EQ(0, num_callback_valid_called_); | 145 EXPECT_EQ(0, num_callback_valid_called_); |
143 EXPECT_EQ(1, num_callback_null_called_); | 146 EXPECT_EQ(1, num_callback_null_called_); |
144 EXPECT_EQ(0, delegate_.num_delegate_valid_called()); | 147 EXPECT_EQ(0, delegate_.num_delegate_valid_called()); |
145 EXPECT_EQ(1, delegate_.num_delegate_null_called()); | 148 EXPECT_EQ(1, delegate_.num_delegate_null_called()); |
146 } | 149 } |
147 | 150 |
148 } // namespace suggestions | 151 } // namespace suggestions |
OLD | NEW |