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

Unified Diff: chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc

Issue 964503002: Implemented ForceMaximizeBrowserWindowOnFirstRun policy, added unit test and browser test. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed description Created 5 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/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
diff --git a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
index 4eaaf8269fc95fdb9c86215e649ec65ddadd54cd..616a053b448d1b89792b123cded86c38ad597a6c 100644
--- a/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
+++ b/chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos_browsertest.cc
@@ -3,129 +3,16 @@
// found in the LICENSE file.
#include <string>
-
-#include "base/command_line.h"
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/files/file_util.h"
-#include "base/files/scoped_temp_dir.h"
-#include "base/macros.h"
bartfab (slow) 2015/03/12 11:54:47 Nit: Keep this.
peletskyi 2015/03/18 13:28:13 Done. Added DISALLOW_COPY_AND_ASSIGN
-#include "base/memory/scoped_ptr.h"
-#include "base/strings/stringprintf.h"
-#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/test/oobe_base_test.h"
-#include "chrome/browser/chromeos/login/wizard_controller.h"
-#include "chrome/browser/policy/test/local_policy_test_server.h"
+#include "chrome/browser/chromeos/policy/login_policy_base_test.h"
bartfab (slow) 2015/03/12 11:54:47 Nit: Add a blank line above.
peletskyi 2015/03/18 13:28:13 Done.
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/host_desktop.h"
bartfab (slow) 2015/03/12 11:54:47 Nit: Still used.
peletskyi 2015/03/18 13:28:13 Done.
#include "chrome/browser/ui/tabs/tab_strip_model.h"
-#include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
-#include "components/policy/core/common/cloud/cloud_policy_constants.h"
-#include "components/policy/core/common/policy_switches.h"
-#include "content/public/browser/notification_service.h"
-#include "content/public/test/test_utils.h"
-#include "google_apis/gaia/fake_gaia.h"
-#include "google_apis/gaia/gaia_constants.h"
-#include "google_apis/gaia/gaia_urls.h"
-#include "testing/gtest/include/gtest/gtest.h"
-#include "url/gurl.h"
namespace policy {
-namespace {
-
-const char kAccountId[] = "dla1@example.com";
-const char kAccountPassword[] = "letmein";
-const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
-const char kTestAuthCode[] = "fake-auth-code";
-const char kTestGaiaUberToken[] = "fake-uber-token";
-const char kTestAuthLoginAccessToken[] = "fake-access-token";
-const char kTestRefreshToken[] = "fake-refresh-token";
-const char kTestAuthSIDCookie[] = "fake-auth-SID-cookie";
-const char kTestAuthLSIDCookie[] = "fake-auth-LSID-cookie";
-const char kTestSessionSIDCookie[] = "fake-session-SID-cookie";
-const char kTestSessionLSIDCookie[] = "fake-session-LSID-cookie";
-const char kTestUserinfoToken[] = "fake-userinfo-token";
-
-} // namespace
-
-class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
- protected:
- UserCloudPolicyManagerTest() {
- set_open_about_blank_on_browser_launch(false);
- }
-
- ~UserCloudPolicyManagerTest() override {}
-
- void SetUp() override {
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
- SetServerPolicy();
-
- test_server_.reset(new LocalPolicyTestServer(policy_file_path()));
- ASSERT_TRUE(test_server_->Start());
-
- OobeBaseTest::SetUp();
- }
-
- void SetUpCommandLine(base::CommandLine* command_line) override {
- command_line->AppendSwitchASCII(policy::switches::kDeviceManagementUrl,
- test_server_->GetServiceURL().spec());
- OobeBaseTest::SetUpCommandLine(command_line);
- }
-
- void SetUpOnMainThread() override {
- SetMergeSessionParams(kAccountId);
- SetupGaiaServerWithAccessTokens();
- OobeBaseTest::SetUpOnMainThread();
- }
-
- void SetupGaiaServerWithAccessTokens() {
- FakeGaia::AccessTokenInfo token_info;
- token_info.token = kTestUserinfoToken;
- token_info.scopes.insert(GaiaConstants::kDeviceManagementServiceOAuth);
- token_info.scopes.insert(GaiaConstants::kOAuthWrapBridgeUserInfoScope);
- token_info.audience = GaiaUrls::GetInstance()->oauth2_chrome_client_id();
- token_info.email = kAccountId;
- fake_gaia_->IssueOAuthToken(kTestRefreshToken, token_info);
- }
-
- void SetMergeSessionParams(const std::string& email) {
- FakeGaia::MergeSessionParams params;
- params.auth_sid_cookie = kTestAuthSIDCookie;
- params.auth_lsid_cookie = kTestAuthLSIDCookie;
- params.auth_code = kTestAuthCode;
- params.refresh_token = kTestRefreshToken;
- params.access_token = kTestAuthLoginAccessToken;
- params.gaia_uber_token = kTestGaiaUberToken;
- params.session_sid_cookie = kTestSessionSIDCookie;
- params.session_lsid_cookie = kTestSessionLSIDCookie;
- params.email = email;
- fake_gaia_->SetMergeSessionParams(params);
- }
-
- void SkipToLoginScreen() {
- chromeos::WizardController::SkipPostLoginScreensForTesting();
- chromeos::WizardController* wizard_controller =
- chromeos::WizardController::default_controller();
- ASSERT_TRUE(wizard_controller);
- wizard_controller->SkipToLoginForTesting(chromeos::LoginScreenContext());
-
- content::WindowedNotificationObserver(
- chrome::NOTIFICATION_LOGIN_OR_LOCK_WEBUI_VISIBLE,
- content::NotificationService::AllSources()).Wait();
- }
-
- void LogIn(const std::string& user_id, const std::string& password) {
- GetLoginDisplay()->ShowSigninScreenForCreds(user_id, password);
-
- content::WindowedNotificationObserver(
- chrome::NOTIFICATION_SESSION_STARTED,
- content::NotificationService::AllSources()).Wait();
- }
-
- void SetServerPolicy() {
- const char kPolicy[] =
+class UserCloudPolicyManagerTest : public LoginPolicyBaseTest {
+ std::string GetPolicy() const override {
bartfab (slow) 2015/03/12 11:54:47 Nit: Mark this as public: or protected:.
peletskyi 2015/03/18 13:28:13 Done.
+ return std::string(
"{"
" \"%s\": {"
" \"mandatory\": {"
@@ -140,29 +27,12 @@ class UserCloudPolicyManagerTest : public chromeos::OobeBaseTest {
" \"managed_users\": [ \"*\" ],"
" \"policy_user\": \"%s\","
" \"current_key_index\": 0"
- "}";
-
- const std::string policy = base::StringPrintf(
- kPolicy, dm_protocol::kChromeUserPolicyType, kAccountId);
-
- const int bytes_written =
- base::WriteFile(policy_file_path(), policy.data(), policy.size());
- ASSERT_EQ(static_cast<int>(policy.size()), bytes_written);
- }
-
- base::FilePath policy_file_path() const {
- return temp_dir_.path().AppendASCII("policy.json");
+ "}");
}
-
- scoped_ptr<LocalPolicyTestServer> test_server_;
-
- base::ScopedTempDir temp_dir_;
-
- private:
- DISALLOW_COPY_AND_ASSIGN(UserCloudPolicyManagerTest);
bartfab (slow) 2015/03/12 11:54:47 Nit: Keep this.
peletskyi 2015/03/18 13:28:13 Done.
};
IN_PROC_BROWSER_TEST_F(UserCloudPolicyManagerTest, StartSession) {
+ const char* const kStartupURLs[] = {"chrome://policy", "chrome://about"};
SkipToLoginScreen();
LogIn(kAccountId, kAccountPassword);

Powered by Google App Engine
This is Rietveld 408576698