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

Side by Side Diff: components/ntp_snippets/remote/remote_suggestions_provider_impl_unittest.cc

Issue 2715153006: Set desired_image_size when decoding images for NTP Tile icons. (Closed)
Patch Set: ax Created 3 years, 9 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/ntp_snippets/remote/remote_suggestions_provider_impl.h" 5 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 30 matching lines...) Expand all
41 #include "components/ntp_snippets/remote/test_utils.h" 41 #include "components/ntp_snippets/remote/test_utils.h"
42 #include "components/ntp_snippets/user_classifier.h" 42 #include "components/ntp_snippets/user_classifier.h"
43 #include "components/prefs/testing_pref_service.h" 43 #include "components/prefs/testing_pref_service.h"
44 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 44 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
45 #include "components/signin/core/browser/fake_signin_manager.h" 45 #include "components/signin/core/browser/fake_signin_manager.h"
46 #include "components/variations/variations_params_manager.h" 46 #include "components/variations/variations_params_manager.h"
47 #include "net/url_request/test_url_fetcher_factory.h" 47 #include "net/url_request/test_url_fetcher_factory.h"
48 #include "net/url_request/url_request_test_util.h" 48 #include "net/url_request/url_request_test_util.h"
49 #include "testing/gmock/include/gmock/gmock.h" 49 #include "testing/gmock/include/gmock/gmock.h"
50 #include "testing/gtest/include/gtest/gtest.h" 50 #include "testing/gtest/include/gtest/gtest.h"
51 #include "ui/gfx/geometry/size.h"
51 #include "ui/gfx/image/image.h" 52 #include "ui/gfx/image/image.h"
52 #include "ui/gfx/image/image_unittest_util.h" 53 #include "ui/gfx/image/image_unittest_util.h"
53 54
54 using image_fetcher::ImageFetcher; 55 using image_fetcher::ImageFetcher;
55 using image_fetcher::ImageFetcherDelegate; 56 using image_fetcher::ImageFetcherDelegate;
56 using testing::_; 57 using testing::_;
57 using testing::ElementsAre; 58 using testing::ElementsAre;
58 using testing::Eq; 59 using testing::Eq;
59 using testing::InSequence; 60 using testing::InSequence;
60 using testing::Invoke; 61 using testing::Invoke;
(...skipping 269 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 return base::MakeUnique<net::FakeURLFetcher>( 331 return base::MakeUnique<net::FakeURLFetcher>(
331 url, d, /*response_data=*/std::string(), net::HTTP_NOT_FOUND, 332 url, d, /*response_data=*/std::string(), net::HTTP_NOT_FOUND,
332 net::URLRequestStatus::FAILED); 333 net::URLRequestStatus::FAILED);
333 } 334 }
334 }; 335 };
335 336
336 class MockImageFetcher : public ImageFetcher { 337 class MockImageFetcher : public ImageFetcher {
337 public: 338 public:
338 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*)); 339 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
339 MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName)); 340 MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName));
341 MOCK_METHOD1(SetDesiredImageFrameSize, void(const gfx::Size&));
340 MOCK_METHOD3( 342 MOCK_METHOD3(
341 StartOrQueueNetworkRequest, 343 StartOrQueueNetworkRequest,
342 void(const std::string&, 344 void(const std::string&,
343 const GURL&, 345 const GURL&,
344 base::Callback<void(const std::string&, const gfx::Image&)>)); 346 base::Callback<void(const std::string&, const gfx::Image&)>));
345 }; 347 };
346 348
347 class FakeImageDecoder : public image_fetcher::ImageDecoder { 349 class FakeImageDecoder : public image_fetcher::ImageDecoder {
348 public: 350 public:
349 FakeImageDecoder() {} 351 FakeImageDecoder() {}
350 ~FakeImageDecoder() override = default; 352 ~FakeImageDecoder() override = default;
351 void DecodeImage( 353 void DecodeImage(
352 const std::string& image_data, 354 const std::string& image_data,
355 const gfx::Size& desired_image_frame_size,
353 const image_fetcher::ImageDecodedCallback& callback) override { 356 const image_fetcher::ImageDecodedCallback& callback) override {
354 callback.Run(decoded_image_); 357 callback.Run(decoded_image_);
355 } 358 }
356 359
357 void SetDecodedImage(const gfx::Image& image) { decoded_image_ = image; } 360 void SetDecodedImage(const gfx::Image& image) { decoded_image_ = image; }
358 361
359 private: 362 private:
360 gfx::Image decoded_image_; 363 gfx::Image decoded_image_;
361 }; 364 };
362 365
(...skipping 1443 matching lines...) Expand 10 before | Expand all | Expand 10 after
1806 RemoteSuggestionsProvider::ProviderStatus)>::Call, 1809 RemoteSuggestionsProvider::ProviderStatus)>::Call,
1807 base::Unretained(&status_callback)))); 1810 base::Unretained(&status_callback))));
1808 1811
1809 // Should be called when becoming disabled. 1812 // Should be called when becoming disabled.
1810 EXPECT_CALL(status_callback, 1813 EXPECT_CALL(status_callback,
1811 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE)); 1814 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE));
1812 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED); 1815 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED);
1813 } 1816 }
1814 1817
1815 } // namespace ntp_snippets 1818 } // namespace ntp_snippets
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698