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

Side by Side Diff: chrome/browser/google/google_url_tracker_unittest.cc

Issue 7524033: Add a scoper object for URLFetcher::Factory (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 4 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/google/google_url_tracker.h" 5 #include "chrome/browser/google/google_url_tracker.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/prefs/browser_prefs.h" 10 #include "chrome/browser/prefs/browser_prefs.h"
11 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h" 11 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
12 #include "chrome/common/chrome_notification_types.h" 12 #include "chrome/common/chrome_notification_types.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "chrome/test/testing_browser_process_test.h" 14 #include "chrome/test/testing_browser_process_test.h"
15 #include "chrome/test/testing_pref_service.h" 15 #include "chrome/test/testing_pref_service.h"
16 #include "content/browser/browser_thread.h" 16 #include "content/browser/browser_thread.h"
17 #include "content/common/notification_service.h" 17 #include "content/common/notification_service.h"
18 #include "content/common/test_url_fetcher_factory.h"
19 #include "content/common/url_fetcher.h" 18 #include "content/common/url_fetcher.h"
19 #include "content/test/test_url_fetcher_factory.h"
20 #include "net/url_request/url_request.h" 20 #include "net/url_request/url_request.h"
21 #include "net/url_request/url_request_context_getter.h" 21 #include "net/url_request/url_request_context_getter.h"
22 #include "net/url_request/url_request_test_util.h" 22 #include "net/url_request/url_request_test_util.h"
23 #include "testing/gtest/include/gtest/gtest.h" 23 #include "testing/gtest/include/gtest/gtest.h"
24 24
25 // TestNotificationObserver --------------------------------------------------- 25 // TestNotificationObserver ---------------------------------------------------
26 26
27 namespace { 27 namespace {
28 28
29 class TestNotificationObserver : public NotificationObserver { 29 class TestNotificationObserver : public NotificationObserver {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 GoogleURLTrackerTest::~GoogleURLTrackerTest() { 150 GoogleURLTrackerTest::~GoogleURLTrackerTest() {
151 } 151 }
152 152
153 void GoogleURLTrackerTest::SetUp() { 153 void GoogleURLTrackerTest::SetUp() {
154 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock()); 154 network_change_notifier_.reset(net::NetworkChangeNotifier::CreateMock());
155 GoogleURLTracker* tracker = new GoogleURLTracker; 155 GoogleURLTracker* tracker = new GoogleURLTracker;
156 tracker->queue_wakeup_task_ = false; 156 tracker->queue_wakeup_task_ = false;
157 MessageLoop::current()->RunAllPending(); 157 MessageLoop::current()->RunAllPending();
158 testing_browser_process_.get()->SetGoogleURLTracker(tracker); 158 testing_browser_process_.get()->SetGoogleURLTracker(tracker);
159 159
160 URLFetcher::set_factory(&fetcher_factory_);
161 g_browser_process->google_url_tracker()->infobar_creator_ = 160 g_browser_process->google_url_tracker()->infobar_creator_ =
162 &CreateTestInfobar; 161 &CreateTestInfobar;
163 } 162 }
164 163
165 void GoogleURLTrackerTest::TearDown() { 164 void GoogleURLTrackerTest::TearDown() {
166 URLFetcher::set_factory(NULL);
167 testing_browser_process_.get()->SetGoogleURLTracker(NULL); 165 testing_browser_process_.get()->SetGoogleURLTracker(NULL);
168 network_change_notifier_.reset(); 166 network_change_notifier_.reset();
169 } 167 }
170 168
171 TestURLFetcher* GoogleURLTrackerTest::GetFetcherByID(int expected_id) { 169 TestURLFetcher* GoogleURLTrackerTest::GetFetcherByID(int expected_id) {
172 return fetcher_factory_.GetFetcherByID(expected_id); 170 return fetcher_factory_.GetFetcherByID(expected_id);
173 } 171 }
174 172
175 void GoogleURLTrackerTest::MockSearchDomainCheckResponse( 173 void GoogleURLTrackerTest::MockSearchDomainCheckResponse(
176 int expected_id, 174 int expected_id,
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
443 NavEntryCommitted(); 441 NavEntryCommitted();
444 EXPECT_TRUE(InfoBarIsShown()); 442 EXPECT_TRUE(InfoBarIsShown());
445 443
446 AcceptGoogleURL(); 444 AcceptGoogleURL();
447 InfoBarClosed(); 445 InfoBarClosed();
448 EXPECT_FALSE(InfoBarIsShown()); 446 EXPECT_FALSE(InfoBarIsShown());
449 EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL()); 447 EXPECT_EQ(GURL("http://www.google.co.jp/"), GoogleURLTracker::GoogleURL());
450 EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL()); 448 EXPECT_EQ(GURL("http://www.google.co.jp/"), GetLastPromptedGoogleURL());
451 EXPECT_TRUE(observer_->notified()); 449 EXPECT_TRUE(observer_->notified());
452 } 450 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_updater_unittest.cc ('k') | chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698