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

Side by Side Diff: chrome/browser/ui/browser_browsertest.cc

Issue 1311333005: Disable material design downloads UI from some tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 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 <string> 5 #include <string>
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
(...skipping 1323 matching lines...) Expand 10 before | Expand all | Expand 10 after
1334 1334
1335 // Urls that should not have shortcuts. 1335 // Urls that should not have shortcuts.
1336 GURL new_tab_url(chrome::kChromeUINewTabURL); 1336 GURL new_tab_url(chrome::kChromeUINewTabURL);
1337 ui_test_utils::NavigateToURL(browser(), new_tab_url); 1337 ui_test_utils::NavigateToURL(browser(), new_tab_url);
1338 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); 1338 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
1339 1339
1340 GURL history_url(chrome::kChromeUIHistoryURL); 1340 GURL history_url(chrome::kChromeUIHistoryURL);
1341 ui_test_utils::NavigateToURL(browser(), history_url); 1341 ui_test_utils::NavigateToURL(browser(), history_url);
1342 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); 1342 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
1343 1343
1344 GURL downloads_url(chrome::kChromeUIDownloadsURL);
1345 ui_test_utils::NavigateToURL(browser(), downloads_url);
1346 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
benwells 2015/09/01 20:35:22 The case this is testing is covered by the history
1347
1348 GURL blank_url(url::kAboutBlankURL); 1344 GURL blank_url(url::kAboutBlankURL);
1349 ui_test_utils::NavigateToURL(browser(), blank_url); 1345 ui_test_utils::NavigateToURL(browser(), blank_url);
1350 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS)); 1346 EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
1351 } 1347 }
1352 1348
1353 // Change a tab into an application window. 1349 // Change a tab into an application window.
1354 // DISABLED: http://crbug.com/72310 1350 // DISABLED: http://crbug.com/72310
1355 IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) { 1351 IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
1356 ASSERT_TRUE(test_server()->Start()); 1352 ASSERT_TRUE(test_server()->Start());
1357 GURL http_url(test_server()->GetURL(std::string())); 1353 GURL http_url(test_server()->GetURL(std::string()));
(...skipping 1757 matching lines...) Expand 10 before | Expand all | Expand 10 after
3115 EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, 3111 EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED,
3116 observer.latest_security_style()); 3112 observer.latest_security_style());
3117 EXPECT_EQ(0u, observer.latest_explanations().warning_explanations.size()); 3113 EXPECT_EQ(0u, observer.latest_explanations().warning_explanations.size());
3118 EXPECT_EQ(0u, observer.latest_explanations().broken_explanations.size()); 3114 EXPECT_EQ(0u, observer.latest_explanations().broken_explanations.size());
3119 CheckSecureExplanations(observer.latest_explanations().secure_explanations, 3115 CheckSecureExplanations(observer.latest_explanations().secure_explanations,
3120 VALID_CERTIFICATE); 3116 VALID_CERTIFICATE);
3121 EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic); 3117 EXPECT_TRUE(observer.latest_explanations().scheme_is_cryptographic);
3122 EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content); 3118 EXPECT_FALSE(observer.latest_explanations().displayed_insecure_content);
3123 EXPECT_FALSE(observer.latest_explanations().ran_insecure_content); 3119 EXPECT_FALSE(observer.latest_explanations().ran_insecure_content);
3124 } 3120 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698