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

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: comment formatting 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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 #include "components/ntp_snippets/remote/test_utils.h" 42 #include "components/ntp_snippets/remote/test_utils.h"
43 #include "components/ntp_snippets/user_classifier.h" 43 #include "components/ntp_snippets/user_classifier.h"
44 #include "components/prefs/testing_pref_service.h" 44 #include "components/prefs/testing_pref_service.h"
45 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 45 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
46 #include "components/signin/core/browser/fake_signin_manager.h" 46 #include "components/signin/core/browser/fake_signin_manager.h"
47 #include "components/variations/variations_params_manager.h" 47 #include "components/variations/variations_params_manager.h"
48 #include "net/url_request/test_url_fetcher_factory.h" 48 #include "net/url_request/test_url_fetcher_factory.h"
49 #include "net/url_request/url_request_test_util.h" 49 #include "net/url_request/url_request_test_util.h"
50 #include "testing/gmock/include/gmock/gmock.h" 50 #include "testing/gmock/include/gmock/gmock.h"
51 #include "testing/gtest/include/gtest/gtest.h" 51 #include "testing/gtest/include/gtest/gtest.h"
52 #include "ui/gfx/geometry/size.h"
52 #include "ui/gfx/image/image.h" 53 #include "ui/gfx/image/image.h"
53 #include "ui/gfx/image/image_unittest_util.h" 54 #include "ui/gfx/image/image_unittest_util.h"
54 55
55 using image_fetcher::ImageFetcher; 56 using image_fetcher::ImageFetcher;
56 using image_fetcher::ImageFetcherDelegate; 57 using image_fetcher::ImageFetcherDelegate;
57 using testing::_; 58 using testing::_;
58 using testing::ElementsAre; 59 using testing::ElementsAre;
59 using testing::Eq; 60 using testing::Eq;
60 using testing::InSequence; 61 using testing::InSequence;
61 using testing::Invoke; 62 using testing::Invoke;
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 return base::MakeUnique<net::FakeURLFetcher>( 333 return base::MakeUnique<net::FakeURLFetcher>(
333 url, d, /*response_data=*/std::string(), net::HTTP_NOT_FOUND, 334 url, d, /*response_data=*/std::string(), net::HTTP_NOT_FOUND,
334 net::URLRequestStatus::FAILED); 335 net::URLRequestStatus::FAILED);
335 } 336 }
336 }; 337 };
337 338
338 class MockImageFetcher : public ImageFetcher { 339 class MockImageFetcher : public ImageFetcher {
339 public: 340 public:
340 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*)); 341 MOCK_METHOD1(SetImageFetcherDelegate, void(ImageFetcherDelegate*));
341 MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName)); 342 MOCK_METHOD1(SetDataUseServiceName, void(DataUseServiceName));
343 MOCK_METHOD1(SetDesiredImageFrameSize, void(const gfx::Size&));
342 MOCK_METHOD3( 344 MOCK_METHOD3(
343 StartOrQueueNetworkRequest, 345 StartOrQueueNetworkRequest,
344 void(const std::string&, 346 void(const std::string&,
345 const GURL&, 347 const GURL&,
346 base::Callback<void(const std::string&, const gfx::Image&)>)); 348 base::Callback<void(const std::string&, const gfx::Image&)>));
347 }; 349 };
348 350
349 class FakeImageDecoder : public image_fetcher::ImageDecoder { 351 class FakeImageDecoder : public image_fetcher::ImageDecoder {
350 public: 352 public:
351 FakeImageDecoder() {} 353 FakeImageDecoder() {}
352 ~FakeImageDecoder() override = default; 354 ~FakeImageDecoder() override = default;
353 void DecodeImage( 355 void DecodeImage(
354 const std::string& image_data, 356 const std::string& image_data,
357 const gfx::Size& desired_image_frame_size,
355 const image_fetcher::ImageDecodedCallback& callback) override { 358 const image_fetcher::ImageDecodedCallback& callback) override {
356 callback.Run(decoded_image_); 359 callback.Run(decoded_image_);
357 } 360 }
358 361
359 void SetDecodedImage(const gfx::Image& image) { decoded_image_ = image; } 362 void SetDecodedImage(const gfx::Image& image) { decoded_image_ = image; }
360 363
361 private: 364 private:
362 gfx::Image decoded_image_; 365 gfx::Image decoded_image_;
363 }; 366 };
364 367
(...skipping 1449 matching lines...) Expand 10 before | Expand all | Expand 10 after
1814 RemoteSuggestionsProvider::ProviderStatus)>::Call, 1817 RemoteSuggestionsProvider::ProviderStatus)>::Call,
1815 base::Unretained(&status_callback)))); 1818 base::Unretained(&status_callback))));
1816 1819
1817 // Should be called when becoming disabled. 1820 // Should be called when becoming disabled.
1818 EXPECT_CALL(status_callback, 1821 EXPECT_CALL(status_callback,
1819 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE)); 1822 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE));
1820 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED); 1823 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED);
1821 } 1824 }
1822 1825
1823 } // namespace ntp_snippets 1826 } // namespace ntp_snippets
OLDNEW
« no previous file with comments | « components/ntp_snippets/remote/remote_suggestions_provider_impl.cc ('k') | components/ntp_tiles/icon_cacher_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698