chrome/browser/infobars/infobars_browsertest.cc - Issue 190063006: Infobar Componentization Proof of Concept

Side by Side Diff: chrome/browser/infobars/infobars_browsertest.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

« chrome/browser/infobars/infobar_service.cc ('K') | « chrome/browser/infobars/infobar_service.cc ('k') | chrome/browser/infobars/insecure_content_infobar_delegate.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 "base/command_line.h"	5 #include "base/command_line.h"

6 #include "chrome/browser/chrome_notification_types.h"	6 #include "chrome/browser/chrome_notification_types.h"

7 #include "chrome/browser/extensions/crx_installer.h"	7 #include "chrome/browser/extensions/crx_installer.h"

8 #include "chrome/browser/extensions/extension_install_prompt.h"	8 #include "chrome/browser/extensions/extension_install_prompt.h"

9 #include "chrome/browser/extensions/extension_service.h"	9 #include "chrome/browser/extensions/extension_service.h"

	10 #include "chrome/browser/infobars/infobar_manager.h"

10 #include "chrome/browser/infobars/infobar_service.h"	11 #include "chrome/browser/infobars/infobar_service.h"

11 #include "chrome/browser/profiles/profile.h"	12 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/themes/theme_service.h"	13 #include "chrome/browser/themes/theme_service.h"

13 #include "chrome/browser/themes/theme_service_factory.h"	14 #include "chrome/browser/themes/theme_service_factory.h"

14 #include "chrome/browser/ui/browser.h"	15 #include "chrome/browser/ui/browser.h"

15 #include "chrome/browser/ui/tabs/tab_strip_model.h"	16 #include "chrome/browser/ui/tabs/tab_strip_model.h"

16 #include "chrome/common/chrome_switches.h"	17 #include "chrome/common/chrome_switches.h"

17 #include "chrome/test/base/in_process_browser_test.h"	18 #include "chrome/test/base/in_process_browser_test.h"

18 #include "chrome/test/base/test_switches.h"	19 #include "chrome/test/base/test_switches.h"

19 #include "chrome/test/base/ui_test_utils.h"	20 #include "chrome/test/base/ui_test_utils.h"

(...skipping 56 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
76 content::WindowedNotificationObserver infobar_added_2(	77 content::WindowedNotificationObserver infobar_added_2(

77 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,	78 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,

78 content::NotificationService::AllSources());	79 content::NotificationService::AllSources());

79 content::WindowedNotificationObserver infobar_removed_1(	80 content::WindowedNotificationObserver infobar_removed_1(

80 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,	81 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,

81 content::NotificationService::AllSources());	82 content::NotificationService::AllSources());

82 InstallExtension("theme2.crx");	83 InstallExtension("theme2.crx");

83 infobar_added_2.Wait();	84 infobar_added_2.Wait();

84 infobar_removed_1.Wait();	85 infobar_removed_1.Wait();

85 EXPECT_EQ(0u,	86 EXPECT_EQ(0u,

86 InfoBarService::FromWebContents(browser()->tab_strip_model()->	87 InfoBarService::FromWebContents(

87 GetWebContentsAt(0))->infobar_count());	88 browser()->tab_strip_model()->GetWebContentsAt(0))

	89 ->infobar_manager()

	90 .infobar_count());
	Peter Kasting 2014/03/18 18:29:17 Nit: Old wrapping was correct (2 places) Nit: Old wrapping was correct (2 places)
88	91

89 content::WindowedNotificationObserver infobar_removed_2(	92 content::WindowedNotificationObserver infobar_removed_2(

90 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,	93 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,

91 content::NotificationService::AllSources());	94 content::NotificationService::AllSources());

92 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();	95 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();

93 infobar_removed_2.Wait();	96 infobar_removed_2.Wait();

94 EXPECT_EQ(0u,	97 EXPECT_EQ(0u,

95 InfoBarService::FromWebContents(browser()->tab_strip_model()->	98 InfoBarService::FromWebContents(

96 GetActiveWebContents())->infobar_count());	99 browser()->tab_strip_model()->GetActiveWebContents())

	100 ->infobar_manager()

	101 .infobar_count());

97 }	102 }

OLD	NEW