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

Side by Side Diff: chrome/test/gpu/webgl_infobar_browsertest.cc

Issue 240193003: Move Infobars core files to the Infobars component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix nib name on mac Created 6 years, 8 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
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "base/path_service.h" 6 #include "base/path_service.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/infobars/confirm_infobar_delegate.h" 9 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
10 #include "chrome/browser/infobars/infobar.h"
11 #include "chrome/browser/infobars/infobar_service.h" 10 #include "chrome/browser/infobars/infobar_service.h"
12 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 12 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/browser_navigator.h" 13 #include "chrome/browser/ui/browser_navigator.h"
15 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
16 #include "chrome/common/chrome_paths.h" 15 #include "chrome/common/chrome_paths.h"
17 #include "chrome/common/chrome_switches.h" 16 #include "chrome/common/chrome_switches.h"
18 #include "chrome/common/url_constants.h" 17 #include "chrome/common/url_constants.h"
19 #include "chrome/test/base/in_process_browser_test.h" 18 #include "chrome/test/base/in_process_browser_test.h"
20 #include "chrome/test/base/test_launcher_utils.h" 19 #include "chrome/test/base/test_launcher_utils.h"
21 #include "chrome/test/base/test_switches.h" 20 #include "chrome/test/base/test_switches.h"
22 #include "chrome/test/base/ui_test_utils.h" 21 #include "chrome/test/base/ui_test_utils.h"
22 #include "components/infobars/core/infobar.h"
23 #include "content/public/browser/gpu_data_manager.h" 23 #include "content/public/browser/gpu_data_manager.h"
24 #include "content/public/browser/notification_service.h" 24 #include "content/public/browser/notification_service.h"
25 #include "content/public/browser/notification_types.h" 25 #include "content/public/browser/notification_types.h"
26 #include "content/public/common/content_paths.h" 26 #include "content/public/common/content_paths.h"
27 #include "content/public/common/page_transition_types.h" 27 #include "content/public/common/page_transition_types.h"
28 #include "content/public/test/browser_test_utils.h" 28 #include "content/public/test/browser_test_utils.h"
29 #include "gpu/config/gpu_test_config.h" 29 #include "gpu/config/gpu_test_config.h"
30 #include "grit/theme_resources.h" 30 #include "grit/theme_resources.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 #include "ui/gl/gl_implementation.h" 32 #include "ui/gl/gl_implementation.h"
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 message_queue.ClearQueue(); 125 message_queue.ClearQueue();
126 126
127 content::WindowedNotificationObserver infobar_added( 127 content::WindowedNotificationObserver infobar_added(
128 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED, 128 chrome::NOTIFICATION_TAB_CONTENTS_INFOBAR_ADDED,
129 content::NotificationService::AllSources()); 129 content::NotificationService::AllSources());
130 SimulateGPUCrash(browser()); 130 SimulateGPUCrash(browser());
131 infobar_added.Wait(); 131 infobar_added.Wait();
132 InfoBarService* infobar_service = InfoBarService::FromWebContents( 132 InfoBarService* infobar_service = InfoBarService::FromWebContents(
133 browser()->tab_strip_model()->GetActiveWebContents()); 133 browser()->tab_strip_model()->GetActiveWebContents());
134 ASSERT_EQ(1u, infobar_service->infobar_count()); 134 ASSERT_EQ(1u, infobar_service->infobar_count());
135 InfoBarDelegate* delegate = infobar_service->infobar_at(0)->delegate(); 135 infobars::InfoBarDelegate* delegate =
136 infobar_service->infobar_at(0)->delegate();
136 ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID()); 137 ASSERT_EQ(IDR_INFOBAR_3D_BLOCKED, delegate->GetIconID());
137 delegate->AsConfirmInfoBarDelegate()->Cancel(); 138 delegate->AsConfirmInfoBarDelegate()->Cancel();
138 139
139 // The page should reload and another message sent to the 140 // The page should reload and another message sent to the
140 // DomAutomationController. 141 // DomAutomationController.
141 m.clear(); 142 m.clear();
142 ASSERT_TRUE(message_queue.WaitForMessage(&m)); 143 ASSERT_TRUE(message_queue.WaitForMessage(&m));
143 EXPECT_EQ("\"LOADED\"", m); 144 EXPECT_EQ("\"LOADED\"", m);
144 } 145 }
145 146
146 // There isn't any point in adding a test which calls Accept() on the 147 // There isn't any point in adding a test which calls Accept() on the
147 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and 148 // ThreeDAPIInfoBarDelegate; doing so doesn't remove the infobar, and
148 // there's no concrete event that could be observed in response. 149 // there's no concrete event that could be observed in response.
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | chrome/test/ppapi/ppapi_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698