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

Unified Diff: chrome/browser/extensions/api/page_capture/page_capture_apitest.cc

Issue 2697833004: Revert of Public Sessions - prompt the user for pageCapture requests (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
diff --git a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
index 3cdf16b7efa0f2f87e112f420aa44ff1bd0f2804..556e4be15b6086ad54e4023b671ff71906b8381a 100644
--- a/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
+++ b/chrome/browser/extensions/api/page_capture/page_capture_apitest.cc
@@ -7,14 +7,11 @@
#include "chrome/browser/extensions/api/page_capture/page_capture_api.h"
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/common/chrome_switches.h"
-#include "chromeos/login/login_state.h"
#include "content/public/common/content_switches.h"
#include "content/public/test/test_utils.h"
-#include "extensions/browser/extension_dialog_auto_confirm.h"
#include "net/dns/mock_host_resolver.h"
using extensions::PageCaptureSaveAsMHTMLFunction;
-using extensions::ScopedTestDialogAutoConfirm;
class ExtensionPageCaptureApiTest : public ExtensionApiTest {
public:
@@ -47,46 +44,9 @@
ASSERT_TRUE(StartEmbeddedTestServer());
PageCaptureSaveAsMHTMLDelegate delegate;
ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
- // Make sure the MHTML data gets written to the temporary file.
ASSERT_FALSE(delegate.temp_file_.empty());
// Flush the message loops to make sure the delete happens.
content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- // Make sure the temporary file is destroyed once the javascript side reads
- // the contents.
ASSERT_FALSE(base::PathExists(delegate.temp_file_));
}
-
-#if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest,
- PublicSessionRequestAllowed) {
- host_resolver()->AddRule("www.a.com", "127.0.0.1");
- ASSERT_TRUE(StartEmbeddedTestServer());
- PageCaptureSaveAsMHTMLDelegate delegate;
- // Set Public Session state.
- chromeos::LoginState::Get()->SetLoggedInState(
- chromeos::LoginState::LOGGED_IN_ACTIVE,
- chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT);
- // Resolve Permission dialog with Allow.
- ScopedTestDialogAutoConfirm auto_confirm(ScopedTestDialogAutoConfirm::ACCEPT);
- ASSERT_TRUE(RunExtensionTest("page_capture")) << message_;
- ASSERT_FALSE(delegate.temp_file_.empty());
- content::RunAllPendingInMessageLoop(content::BrowserThread::FILE);
- content::RunAllPendingInMessageLoop(content::BrowserThread::IO);
- ASSERT_FALSE(base::PathExists(delegate.temp_file_));
-}
-
-IN_PROC_BROWSER_TEST_F(ExtensionPageCaptureApiTest,
- PublicSessionRequestDenied) {
- host_resolver()->AddRule("www.a.com", "127.0.0.1");
- ASSERT_TRUE(StartEmbeddedTestServer());
- // Set Public Session state.
- chromeos::LoginState::Get()->SetLoggedInState(
- chromeos::LoginState::LOGGED_IN_ACTIVE,
- chromeos::LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT);
- // Resolve Permission dialog with Deny.
- ScopedTestDialogAutoConfirm auto_confirm(ScopedTestDialogAutoConfirm::CANCEL);
- ASSERT_TRUE(RunExtensionTestWithArg("page_capture", "REQUEST_DENIED"))
- << message_;
-}
-#endif // defined(OS_CHROMEOS)

Powered by Google App Engine
This is Rietveld 408576698