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

Side by Side Diff: chrome/browser/ui/views/extensions/extension_install_dialog_view_browsertest.cc

Issue 409743003: Use content::RunBlockingPoolTask() in tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed. Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/run_loop.h" 5 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
6
6 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/extensions/extension_browsertest.h" 8 #include "chrome/browser/extensions/extension_browsertest.h"
8 #include "chrome/browser/extensions/extension_icon_manager.h" 9 #include "chrome/browser/extensions/extension_icon_manager.h"
9 #include "chrome/browser/extensions/extension_install_prompt.h" 10 #include "chrome/browser/extensions/extension_install_prompt.h"
10 #include "chrome/browser/extensions/extension_install_prompt_experiment.h" 11 #include "chrome/browser/extensions/extension_install_prompt_experiment.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
13 #include "chrome/browser/ui/views/constrained_window_views.h" 14 #include "chrome/browser/ui/views/constrained_window_views.h"
14 #include "chrome/browser/ui/views/extensions/extension_install_dialog_view.h"
15 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 15 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
16 #include "chrome/common/extensions/extension_test_util.h" 16 #include "chrome/common/extensions/extension_test_util.h"
17 #include "content/public/browser/browser_thread.h" 17 #include "content/public/browser/browser_thread.h"
18 #include "content/public/test/test_utils.h"
18 #include "extensions/common/extension.h" 19 #include "extensions/common/extension.h"
19 #include "extensions/common/permissions/permissions_data.h" 20 #include "extensions/common/permissions/permissions_data.h"
20 #include "extensions/common/test_util.h" 21 #include "extensions/common/test_util.h"
21 #include "ui/views/controls/scroll_view.h" 22 #include "ui/views/controls/scroll_view.h"
22 #include "ui/views/view.h" 23 #include "ui/views/view.h"
23 #include "ui/views/widget/widget.h" 24 #include "ui/views/widget/widget.h"
24 25
25 // A simple delegate implementation that counts the number of times 26 // A simple delegate implementation that counts the number of times
26 // |InstallUIProceed| and |InstallUIAbort| are called. 27 // |InstallUIProceed| and |InstallUIAbort| are called.
27 class MockExtensionInstallPromptDelegate 28 class MockExtensionInstallPromptDelegate
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 bool ScrollbarTest::IsScrollbarVisible() { 137 bool ScrollbarTest::IsScrollbarVisible() {
137 ExtensionInstallPrompt::ShowParams show_params(web_contents_); 138 ExtensionInstallPrompt::ShowParams show_params(web_contents_);
138 MockExtensionInstallPromptDelegate delegate; 139 MockExtensionInstallPromptDelegate delegate;
139 ExtensionInstallDialogView* dialog = 140 ExtensionInstallDialogView* dialog =
140 new ExtensionInstallDialogView(show_params.navigator, &delegate, prompt_); 141 new ExtensionInstallDialogView(show_params.navigator, &delegate, prompt_);
141 142
142 // Create the modal view around the install dialog view. 143 // Create the modal view around the install dialog view.
143 views::Widget* modal = 144 views::Widget* modal =
144 CreateBrowserModalDialogViews(dialog, show_params.parent_window); 145 CreateBrowserModalDialogViews(dialog, show_params.parent_window);
145 modal->Show(); 146 modal->Show();
146 content::BrowserThread::GetBlockingPool()->FlushForTesting(); 147 content::RunAllBlockingPoolTasksUntilIdle();
147 base::RunLoop().RunUntilIdle();
148 148
149 // Check if the vertical scrollbar is visible. 149 // Check if the vertical scrollbar is visible.
150 return dialog->scroll_view()->vertical_scroll_bar()->visible(); 150 return dialog->scroll_view()->vertical_scroll_bar()->visible();
151 } 151 }
152 152
153 // Tests that a scrollbar _is_ shown for an excessively long extension 153 // Tests that a scrollbar _is_ shown for an excessively long extension
154 // install prompt. 154 // install prompt.
155 IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) { 155 IN_PROC_BROWSER_TEST_F(ScrollbarTest, LongPromptScrollbar) {
156 base::string16 permission_string(base::ASCIIToUTF16("Test")); 156 base::string16 permission_string(base::ASCIIToUTF16("Test"));
157 std::vector<base::string16> permissions; 157 std::vector<base::string16> permissions;
(...skipping 13 matching lines...) Expand all
171 base::string16 permission_string(base::ASCIIToUTF16( 171 base::string16 permission_string(base::ASCIIToUTF16(
172 "Read and modify your data on *.facebook.com")); 172 "Read and modify your data on *.facebook.com"));
173 std::vector<base::string16> permissions; 173 std::vector<base::string16> permissions;
174 permissions.push_back(permission_string); 174 permissions.push_back(permission_string);
175 this->SetPromptPermissions(permissions); 175 this->SetPromptPermissions(permissions);
176 std::vector<base::string16> details; 176 std::vector<base::string16> details;
177 details.push_back(base::string16()); 177 details.push_back(base::string16());
178 this->SetPromptDetails(details); 178 this->SetPromptDetails(details);
179 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible"; 179 ASSERT_FALSE(IsScrollbarVisible()) << "Scrollbar is visible";
180 } 180 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698