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

Side by Side Diff: chrome/browser/infobars/infobars_browsertest.cc

Issue 816403003: Make callers of CommandLine use it via the base:: namespace. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years, 12 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 "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_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 observer.Wait(); 46 observer.Wait();
47 } 47 }
48 }; 48 };
49 49
50 IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) { 50 IN_PROC_BROWSER_TEST_F(InfoBarsTest, TestInfoBarsCloseOnNewTheme) {
51 ExtensionInstallPrompt::g_auto_confirm_for_tests = 51 ExtensionInstallPrompt::g_auto_confirm_for_tests =
52 ExtensionInstallPrompt::ACCEPT; 52 ExtensionInstallPrompt::ACCEPT;
53 53
54 #if defined(OS_WIN) && defined(USE_ASH) 54 #if defined(OS_WIN) && defined(USE_ASH)
55 // Disable this test in Metro+Ash for now (http://crbug.com/262796). 55 // Disable this test in Metro+Ash for now (http://crbug.com/262796).
56 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kAshBrowserTests)) 56 if (base::CommandLine::ForCurrentProcess()->HasSwitch(
57 switches::kAshBrowserTests))
57 return; 58 return;
58 #endif 59 #endif
59 60
60 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); 61 ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
61 62
62 ui_test_utils::NavigateToURL( 63 ui_test_utils::NavigateToURL(
63 browser(), embedded_test_server()->GetURL("/simple.html")); 64 browser(), embedded_test_server()->GetURL("/simple.html"));
64 65
65 content::WindowedNotificationObserver infobar_added_1( 66 content::WindowedNotificationObserver infobar_added_1(
66 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, 67 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
(...skipping 21 matching lines...) Expand all
88 content::WindowedNotificationObserver infobar_removed_2( 89 content::WindowedNotificationObserver infobar_removed_2(
89 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED, 90 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_REMOVED,
90 content::NotificationService::AllSources()); 91 content::NotificationService::AllSources());
91 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme(); 92 ThemeServiceFactory::GetForProfile(browser()->profile())->UseDefaultTheme();
92 infobar_removed_2.Wait(); 93 infobar_removed_2.Wait();
93 EXPECT_EQ(0u, 94 EXPECT_EQ(0u,
94 InfoBarService::FromWebContents( 95 InfoBarService::FromWebContents(
95 browser()->tab_strip_model()->GetActiveWebContents())-> 96 browser()->tab_strip_model()->GetActiveWebContents())->
96 infobar_count()); 97 infobar_count());
97 } 98 }
OLDNEW
« no previous file with comments | « chrome/browser/history/history_browsertest.cc ('k') | chrome/browser/intranet_redirect_detector.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698