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

Side by Side Diff: chrome/browser/ui/webui/options/certificate_manager_browsertest.cc

Issue 366813007: Removed InProcessBrowserTest::CleanUpOnMainThread() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More merge to ToT. Created 6 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 | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/callback.h" 5 #include "base/callback.h"
6 #include "base/values.h" 6 #include "base/values.h"
7 #include "chrome/browser/browser_process.h" 7 #include "chrome/browser/browser_process.h"
8 #include "chrome/browser/ui/browser.h" 8 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/tabs/tab_strip_model.h" 9 #include "chrome/browser/ui/tabs/tab_strip_model.h"
10 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h" 10 #include "chrome/browser/ui/webui/options/options_ui_browsertest.h"
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 browser()->profile(), 107 browser()->profile(),
108 base::Bind( 108 base::Bind(
109 &CertificateManagerBrowserTest::UpdateNetworkConfigurationUpdater, 109 &CertificateManagerBrowserTest::UpdateNetworkConfigurationUpdater,
110 base::Unretained(this))); 110 base::Unretained(this)));
111 111
112 content::RunAllPendingInMessageLoop(content::BrowserThread::IO); 112 content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
113 content::RunAllPendingInMessageLoop(); 113 content::RunAllPendingInMessageLoop();
114 #endif 114 #endif
115 } 115 }
116 116
117 virtual void CleanUpOnMainThread() OVERRIDE { 117 virtual void TearDownOnMainThread() OVERRIDE {
118 content::BrowserThread::PostTask( 118 content::BrowserThread::PostTask(
119 content::BrowserThread::IO, 119 content::BrowserThread::IO,
120 FROM_HERE, 120 FROM_HERE,
121 base::Bind(&CertificateManagerBrowserTest::TearDownOnIOThread, this)); 121 base::Bind(&CertificateManagerBrowserTest::TearDownOnIOThread, this));
122 content::RunAllPendingInMessageLoop(content::BrowserThread::IO); 122 content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
123 } 123 }
124 124
125 #if defined(OS_CHROMEOS) 125 #if defined(OS_CHROMEOS)
126 void UpdateNetworkConfigurationUpdater(net::NSSCertDatabase* database) { 126 void UpdateNetworkConfigurationUpdater(net::NSSCertDatabase* database) {
127 policy::UserNetworkConfigurationUpdaterFactory::GetForProfile( 127 policy::UserNetworkConfigurationUpdaterFactory::GetForProfile(
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
185 // managed setting indicator (only on Chrome OS). 185 // managed setting indicator (only on Chrome OS).
186 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest, 186 IN_PROC_BROWSER_TEST_F(CertificateManagerBrowserTest,
187 PolicyCertificateWithWebTrustHasIndicator) { 187 PolicyCertificateWithWebTrustHasIndicator) {
188 LoadONCPolicy("certificate-web-authority.onc"); 188 LoadONCPolicy("certificate-web-authority.onc");
189 NavigateToSettings(); 189 NavigateToSettings();
190 ClickElement("#certificatesManageButton"); 190 ClickElement("#certificatesManageButton");
191 ClickElement("#ca-certs-nav-tab"); 191 ClickElement("#ca-certs-nav-tab");
192 EXPECT_TRUE(HasElement(".cert-policy")); 192 EXPECT_TRUE(HasElement(".cert-policy"));
193 } 193 }
194 #endif 194 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698