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

Side by Side Diff: chrome/browser/permissions/permissions_browsertest.cc

Issue 2952163002: Remove InProcessBrowserTest::SetUpOnMainThread() calls. (Closed)
Patch Set: rebase Created 3 years, 5 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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/permissions/permissions_browsertest.h" 5 #include "chrome/browser/permissions/permissions_browsertest.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/permissions/permission_request_manager.h" 8 #include "chrome/browser/permissions/permission_request_manager.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h" 10 #include "chrome/browser/ui/permission_bubble/mock_permission_prompt_factory.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/web_contents.h" 13 #include "content/public/browser/web_contents.h"
14 #include "content/public/test/browser_test_utils.h" 14 #include "content/public/test/browser_test_utils.h"
15 #include "content/public/test/test_utils.h" 15 #include "content/public/test/test_utils.h"
16 #include "net/test/embedded_test_server/embedded_test_server.h" 16 #include "net/test/embedded_test_server/embedded_test_server.h"
17 17
18 PermissionsBrowserTest::PermissionsBrowserTest(const std::string& test_url) 18 PermissionsBrowserTest::PermissionsBrowserTest(const std::string& test_url)
19 : test_url_(test_url) {} 19 : test_url_(test_url) {}
20 20
21 PermissionsBrowserTest::~PermissionsBrowserTest() {} 21 PermissionsBrowserTest::~PermissionsBrowserTest() {}
22 22
23 void PermissionsBrowserTest::SetUpOnMainThread() { 23 void PermissionsBrowserTest::SetUpOnMainThread() {
24 InProcessBrowserTest::SetUpOnMainThread();
25
26 PermissionRequestManager* manager = PermissionRequestManager::FromWebContents( 24 PermissionRequestManager* manager = PermissionRequestManager::FromWebContents(
27 browser()->tab_strip_model()->GetActiveWebContents()); 25 browser()->tab_strip_model()->GetActiveWebContents());
28 prompt_factory_.reset(new MockPermissionPromptFactory(manager)); 26 prompt_factory_.reset(new MockPermissionPromptFactory(manager));
29 manager->DisplayPendingRequests(); 27 manager->DisplayPendingRequests();
30 28
31 ASSERT_TRUE(embedded_test_server()->Start()); 29 ASSERT_TRUE(embedded_test_server()->Start());
32 30
33 ui_test_utils::NavigateToURL(browser(), 31 ui_test_utils::NavigateToURL(browser(),
34 embedded_test_server()->GetURL(test_url())); 32 embedded_test_server()->GetURL(test_url()));
35 } 33 }
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 } 75 }
78 76
79 void PermissionsBrowserTest::CommonSucceedsIfAllowed() { 77 void PermissionsBrowserTest::CommonSucceedsIfAllowed() {
80 EXPECT_EQ(0, prompt_factory()->TotalRequestCount()); 78 EXPECT_EQ(0, prompt_factory()->TotalRequestCount());
81 prompt_factory()->set_response_type(PermissionRequestManager::ACCEPT_ALL); 79 prompt_factory()->set_response_type(PermissionRequestManager::ACCEPT_ALL);
82 TriggerPrompt(); 80 TriggerPrompt();
83 81
84 EXPECT_TRUE(FeatureUsageSucceeds()); 82 EXPECT_TRUE(FeatureUsageSucceeds());
85 EXPECT_EQ(1, prompt_factory()->TotalRequestCount()); 83 EXPECT_EQ(1, prompt_factory()->TotalRequestCount());
86 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698