| Index: chrome/browser/ui/browser_browsertest.cc
|
| diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
|
| index 58fb6ae4620345108dbf70d0b4f3d437e88b33b3..af8a9377e76a96d7aa898be4b56e7d304fa9c5cf 100644
|
| --- a/chrome/browser/ui/browser_browsertest.cc
|
| +++ b/chrome/browser/ui/browser_browsertest.cc
|
| @@ -1215,132 +1215,6 @@ IN_PROC_BROWSER_TEST_F(BrowserTest, RenderIdleTime) {
|
| }
|
| }
|
|
|
| -// Test IDC_CREATE_SHORTCUTS command is enabled for url scheme file, ftp, http
|
| -// and https and disabled for chrome://, about:// etc.
|
| -// TODO(pinkerton): Disable app-mode in the model until we implement it
|
| -// on the Mac. http://crbug.com/13148
|
| -#if !defined(OS_MACOSX)
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFile) {
|
| - CommandUpdater* command_updater =
|
| - browser()->command_controller()->command_updater();
|
| -
|
| - static const base::FilePath::CharType* kEmptyFile =
|
| - FILE_PATH_LITERAL("empty.html");
|
| - GURL file_url(ui_test_utils::GetTestUrl(base::FilePath(
|
| - base::FilePath::kCurrentDirectory), base::FilePath(kEmptyFile)));
|
| - ASSERT_TRUE(file_url.SchemeIs(url::kFileScheme));
|
| - ui_test_utils::NavigateToURL(browser(), file_url);
|
| - EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttp) {
|
| - CommandUpdater* command_updater =
|
| - browser()->command_controller()->command_updater();
|
| -
|
| - ASSERT_TRUE(embedded_test_server()->Start());
|
| - GURL http_url(embedded_test_server()->GetURL("/"));
|
| - ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme));
|
| - ui_test_utils::NavigateToURL(browser(), http_url);
|
| - EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutHttps) {
|
| - CommandUpdater* command_updater =
|
| - browser()->command_controller()->command_updater();
|
| -
|
| - net::EmbeddedTestServer https_test_server(
|
| - net::EmbeddedTestServer::TYPE_HTTPS);
|
| - https_test_server.ServeFilesFromSourceDirectory(base::FilePath(kDocRoot));
|
| - ASSERT_TRUE(https_test_server.Start());
|
| -
|
| - GURL https_url(https_test_server.GetURL("/"));
|
| - ASSERT_TRUE(https_url.SchemeIs(url::kHttpsScheme));
|
| - ui_test_utils::NavigateToURL(browser(), https_url);
|
| - EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutFtp) {
|
| - CommandUpdater* command_updater =
|
| - browser()->command_controller()->command_updater();
|
| -
|
| - net::SpawnedTestServer test_server(net::SpawnedTestServer::TYPE_FTP,
|
| - net::SpawnedTestServer::kLocalhost,
|
| - base::FilePath(kDocRoot));
|
| - ASSERT_TRUE(test_server.Start());
|
| - GURL ftp_url(test_server.GetURL(std::string()));
|
| - ASSERT_TRUE(ftp_url.SchemeIs(url::kFtpScheme));
|
| - ui_test_utils::NavigateToURL(browser(), ftp_url);
|
| - EXPECT_TRUE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -}
|
| -
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, CommandCreateAppShortcutInvalid) {
|
| - CommandUpdater* command_updater =
|
| - browser()->command_controller()->command_updater();
|
| -
|
| - // Urls that should not have shortcuts.
|
| - GURL new_tab_url(chrome::kChromeUINewTabURL);
|
| - ui_test_utils::NavigateToURL(browser(), new_tab_url);
|
| - EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -
|
| - GURL history_url(chrome::kChromeUIHistoryURL);
|
| - ui_test_utils::NavigateToURL(browser(), history_url);
|
| - EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -
|
| - GURL blank_url(url::kAboutBlankURL);
|
| - ui_test_utils::NavigateToURL(browser(), blank_url);
|
| - EXPECT_FALSE(command_updater->IsCommandEnabled(IDC_CREATE_SHORTCUTS));
|
| -}
|
| -
|
| -// Change a tab into an application window.
|
| -// DISABLED: http://crbug.com/72310
|
| -IN_PROC_BROWSER_TEST_F(BrowserTest, DISABLED_ConvertTabToAppShortcut) {
|
| - ASSERT_TRUE(embedded_test_server()->Start());
|
| - GURL http_url(embedded_test_server()->GetURL("/"));
|
| - ASSERT_TRUE(http_url.SchemeIs(url::kHttpScheme));
|
| -
|
| - ASSERT_EQ(1, browser()->tab_strip_model()->count());
|
| - WebContents* initial_tab = browser()->tab_strip_model()->GetWebContentsAt(0);
|
| - WebContents* app_tab = chrome::AddSelectedTabWithURL(
|
| - browser(), http_url, ui::PAGE_TRANSITION_TYPED);
|
| - ASSERT_EQ(2, browser()->tab_strip_model()->count());
|
| - ASSERT_EQ(1u, chrome::GetBrowserCount(browser()->profile()));
|
| -
|
| - // Normal tabs should accept load drops.
|
| - EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops);
|
| - EXPECT_TRUE(app_tab->GetMutableRendererPrefs()->can_accept_load_drops);
|
| -
|
| - // Turn |app_tab| into a tab in an app panel.
|
| - chrome::ConvertTabToAppWindow(browser(), app_tab);
|
| -
|
| - // The launch should have created a new browser.
|
| - ASSERT_EQ(2u, chrome::GetBrowserCount(browser()->profile()));
|
| -
|
| - // Find the new browser.
|
| - Browser* app_browser = NULL;
|
| - for (auto* b : *BrowserList::GetInstance()) {
|
| - if (b != browser())
|
| - app_browser = b;
|
| - }
|
| - ASSERT_TRUE(app_browser);
|
| -
|
| - // Check that the tab contents is in the new browser, and not in the old.
|
| - ASSERT_EQ(1, browser()->tab_strip_model()->count());
|
| - ASSERT_EQ(initial_tab, browser()->tab_strip_model()->GetWebContentsAt(0));
|
| -
|
| - // Check that the appliaction browser has a single tab, and that tab contains
|
| - // the content that we app-ified.
|
| - ASSERT_EQ(1, app_browser->tab_strip_model()->count());
|
| - ASSERT_EQ(app_tab, app_browser->tab_strip_model()->GetWebContentsAt(0));
|
| -
|
| - // Normal tabs should accept load drops.
|
| - EXPECT_TRUE(initial_tab->GetMutableRendererPrefs()->can_accept_load_drops);
|
| -
|
| - // The tab in an app window should not.
|
| - EXPECT_FALSE(app_tab->GetMutableRendererPrefs()->can_accept_load_drops);
|
| -}
|
| -
|
| -#endif // !defined(OS_MACOSX)
|
| -
|
| // Test RenderView correctly send back favicon url for web page that redirects
|
| // to an anchor in javascript body.onload handler.
|
| IN_PROC_BROWSER_TEST_F(BrowserTest,
|
|
|