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

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

Issue 190063006: Infobar Componentization Proof of Concept (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minor fixes Created 6 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_service.h" 11 #include "base/prefs/pref_service.h"
12 #include "chrome/browser/chrome_notification_types.h" 12 #include "chrome/browser/chrome_notification_types.h"
13 #include "chrome/browser/google/google_url_tracker_factory.h" 13 #include "chrome/browser/google/google_url_tracker_factory.h"
14 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h" 14 #include "chrome/browser/google/google_url_tracker_infobar_delegate.h"
15 #include "chrome/browser/google/google_url_tracker_navigation_helper.h" 15 #include "chrome/browser/google/google_url_tracker_navigation_helper.h"
16 #include "chrome/browser/infobars/infobar.h" 16 #include "chrome/browser/infobars/infobar.h"
17 #include "chrome/browser/infobars/infobar_delegate.h" 17 #include "chrome/browser/infobars/infobar_delegate.h"
18 #include "chrome/browser/infobars/infobar_service.h"
18 #include "chrome/common/pref_names.h" 19 #include "chrome/common/pref_names.h"
19 #include "chrome/test/base/testing_profile.h" 20 #include "chrome/test/base/testing_profile.h"
20 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
21 #include "content/public/test/test_browser_thread_bundle.h" 22 #include "content/public/test/test_browser_thread_bundle.h"
22 #include "net/url_request/test_url_fetcher_factory.h" 23 #include "net/url_request/test_url_fetcher_factory.h"
23 #include "net/url_request/url_fetcher.h" 24 #include "net/url_request/url_fetcher.h"
24 #include "testing/gtest/include/gtest/gtest.h" 25 #include "testing/gtest/include/gtest/gtest.h"
25 26
26 class GoogleURLTrackerTest; 27 class GoogleURLTrackerTest;
27 28
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
467 return ConfirmInfoBarDelegate::CreateInfoBar( 468 return ConfirmInfoBarDelegate::CreateInfoBar(
468 scoped_ptr<ConfirmInfoBarDelegate>(new TestInfoBarDelegate( 469 scoped_ptr<ConfirmInfoBarDelegate>(new TestInfoBarDelegate(
469 test_harness, infobar_service, google_url_tracker, 470 test_harness, infobar_service, google_url_tracker,
470 search_url))).release(); 471 search_url))).release();
471 } 472 }
472 473
473 TestInfoBarDelegate::TestInfoBarDelegate(GoogleURLTrackerTest* test_harness, 474 TestInfoBarDelegate::TestInfoBarDelegate(GoogleURLTrackerTest* test_harness,
474 InfoBarService* infobar_service, 475 InfoBarService* infobar_service,
475 GoogleURLTracker* google_url_tracker, 476 GoogleURLTracker* google_url_tracker,
476 const GURL& search_url) 477 const GURL& search_url)
477 : GoogleURLTrackerInfoBarDelegate(google_url_tracker, search_url), 478 : GoogleURLTrackerInfoBarDelegate(infobar_service->web_contents(),
478 test_harness_(test_harness), 479 google_url_tracker,
479 infobar_service_(infobar_service) { 480 search_url),
480 } 481 test_harness_(test_harness),
482 infobar_service_(infobar_service) {}
481 483
482 TestInfoBarDelegate::~TestInfoBarDelegate() { 484 TestInfoBarDelegate::~TestInfoBarDelegate() {
483 } 485 }
484 486
485 void TestInfoBarDelegate::Update(const GURL& search_url) { 487 void TestInfoBarDelegate::Update(const GURL& search_url) {
486 set_search_url(search_url); 488 set_search_url(search_url);
487 set_pending_id(0); 489 set_pending_id(0);
488 } 490 }
489 491
490 void TestInfoBarDelegate::Close(bool redo_search) { 492 void TestInfoBarDelegate::Close(bool redo_search) {
(...skipping 585 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2")); 1078 CommitSearch(2, GURL("http://www.google.co.uk/search?q=test2"));
1077 EXPECT_FALSE(GetInfoBarDelegate(1) == NULL); 1079 EXPECT_FALSE(GetInfoBarDelegate(1) == NULL);
1078 GoogleURLTrackerInfoBarDelegate* delegate2 = GetInfoBarDelegate(2); 1080 GoogleURLTrackerInfoBarDelegate* delegate2 = GetInfoBarDelegate(2);
1079 ASSERT_FALSE(delegate2 == NULL); 1081 ASSERT_FALSE(delegate2 == NULL);
1080 SetNavigationPending(1, true); 1082 SetNavigationPending(1, true);
1081 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true)); 1083 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, true));
1082 delegate2->Close(false); 1084 delegate2->Close(false);
1083 SetNavigationPending(1, false); 1085 SetNavigationPending(1, false);
1084 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false)); 1086 ASSERT_NO_FATAL_FAILURE(ExpectListeningForCommit(1, false));
1085 } 1087 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698