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

Unified Diff: chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc

Issue 600203002: Revert of [Suggestions] Move ImageManager to the component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc
diff --git a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc b/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc
deleted file mode 100644
index 8b4fcfda2f48db3b43a0c35cf030ae31e0a9277d..0000000000000000000000000000000000000000
--- a/chrome/browser/search/suggestions/image_fetcher_impl_browsertest.cc
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "chrome/browser/search/suggestions/image_fetcher_impl.h"
-
-#include "base/bind.h"
-#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/run_loop.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/browser.h"
-#include "chrome/test/base/in_process_browser_test.h"
-#include "components/suggestions/image_fetcher_delegate.h"
-#include "net/test/spawned_test_server/spawned_test_server.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
-
-class SkBitmap;
-
-namespace suggestions {
-
-namespace {
-
-const char kTestUrl[] = "http://go.com/";
-const char kTestImagePath[] = "files/image_decoding/droids.png";
-const char kInvalidImagePath[] = "files/DOESNOTEXIST";
-
-const base::FilePath::CharType kDocRoot[] =
- FILE_PATH_LITERAL("chrome/test/data");
-
-class TestImageFetcherDelegate : public ImageFetcherDelegate {
- public:
- TestImageFetcherDelegate()
- : num_delegate_valid_called_(0),
- num_delegate_null_called_(0) {}
- virtual ~TestImageFetcherDelegate() {};
-
- // Perform additional tasks when an image has been fetched.
- virtual void OnImageFetched(const GURL& url, const SkBitmap* bitmap)
- OVERRIDE {
- if (bitmap) {
- num_delegate_valid_called_++;
- } else {
- num_delegate_null_called_++;
- }
- };
-
- int num_delegate_valid_called() { return num_delegate_valid_called_; }
- int num_delegate_null_called() { return num_delegate_null_called_; }
-
- private:
- int num_delegate_valid_called_;
- int num_delegate_null_called_;
-};
-
-} // end namespace
-
-class ImageFetcherImplBrowserTest : public InProcessBrowserTest {
- protected:
- ImageFetcherImplBrowserTest()
- : num_callback_valid_called_(0),
- num_callback_null_called_(0),
- test_server_(net::SpawnedTestServer::TYPE_HTTP,
- net::SpawnedTestServer::kLocalhost,
- base::FilePath(kDocRoot)) {}
-
- virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
- ASSERT_TRUE(test_server_.Start());
- InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
- }
-
- virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
- test_server_.Stop();
- }
-
- ImageFetcherImpl* CreateImageFetcher() {
- ImageFetcherImpl* fetcher =
- new ImageFetcherImpl(browser()->profile()->GetRequestContext());
- fetcher->SetImageFetcherDelegate(&delegate_);
- return fetcher;
- }
-
- void OnImageAvailable(base::RunLoop* loop,
- const GURL& url,
- const SkBitmap* bitmap) {
- if (bitmap) {
- num_callback_valid_called_++;
- } else {
- num_callback_null_called_++;
- }
- loop->Quit();
- }
-
- void StartOrQueueNetworkRequestHelper(const GURL& image_url) {
- scoped_ptr<ImageFetcherImpl> image_fetcher_(CreateImageFetcher());
-
- base::RunLoop run_loop;
- image_fetcher_->StartOrQueueNetworkRequest(
- GURL(kTestUrl),
- image_url,
- base::Bind(&ImageFetcherImplBrowserTest::OnImageAvailable,
- base::Unretained(this), &run_loop));
- run_loop.Run();
- }
-
- int num_callback_valid_called_;
- int num_callback_null_called_;
-
- net::SpawnedTestServer test_server_;
- TestImageFetcherDelegate delegate_;
-
- DISALLOW_COPY_AND_ASSIGN(ImageFetcherImplBrowserTest);
-};
-
-IN_PROC_BROWSER_TEST_F(ImageFetcherImplBrowserTest, NormalFetch) {
- GURL image_url(test_server_.GetURL(kTestImagePath).spec());
- StartOrQueueNetworkRequestHelper(image_url);
-
- EXPECT_EQ(1, num_callback_valid_called_);
- EXPECT_EQ(0, num_callback_null_called_);
- EXPECT_EQ(1, delegate_.num_delegate_valid_called());
- EXPECT_EQ(0, delegate_.num_delegate_null_called());
-}
-
-IN_PROC_BROWSER_TEST_F(ImageFetcherImplBrowserTest, MultipleFetch) {
- GURL image_url(test_server_.GetURL(kTestImagePath).spec());
-
- for (int i = 0; i < 5; i++) {
- StartOrQueueNetworkRequestHelper(image_url);
- }
-
- EXPECT_EQ(5, num_callback_valid_called_);
- EXPECT_EQ(0, num_callback_null_called_);
- EXPECT_EQ(5, delegate_.num_delegate_valid_called());
- EXPECT_EQ(0, delegate_.num_delegate_null_called());
-}
-
-IN_PROC_BROWSER_TEST_F(ImageFetcherImplBrowserTest, InvalidFetch) {
- GURL invalid_image_url(test_server_.GetURL(kInvalidImagePath).spec());
- StartOrQueueNetworkRequestHelper(invalid_image_url);
-
- EXPECT_EQ(0, num_callback_valid_called_);
- EXPECT_EQ(1, num_callback_null_called_);
- EXPECT_EQ(0, delegate_.num_delegate_valid_called());
- EXPECT_EQ(1, delegate_.num_delegate_null_called());
-}
-
-} // namespace suggestions
« no previous file with comments | « chrome/browser/search/suggestions/image_fetcher_impl.cc ('k') | chrome/browser/search/suggestions/image_manager_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698