chrome/browser/chromeos/login/login_utils_browsertest.cc - Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances

Unified Diff: chrome/browser/chromeos/login/login_utils_browsertest.cc

Issue 14200028: Make CrosSettings and DeviceSettingsService non Lazy instances (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 7 years, 8 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

« chrome/browser/chromeos/chrome_browser_main_chromeos.cc ('K') | « chrome/browser/chromeos/login/existing_user_controller_auto_login_unittest.cc ('k') | chrome/browser/chromeos/login/merge_session_load_page_unittest.cc » ('j') | chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/login_utils_browsertest.cc

diff --git a/chrome/browser/chromeos/login/login_utils_browsertest.cc b/chrome/browser/chromeos/login/login_utils_browsertest.cc

index ad71d1c1540fd28f9c9490e2b95c4c507eead2f0..99e18c748fb8f694486c32366aa3a03a486e1549 100644

--- a/chrome/browser/chromeos/login/login_utils_browsertest.cc

+++ b/chrome/browser/chromeos/login/login_utils_browsertest.cc

@@ -26,6 +26,7 @@

#include "chrome/browser/chromeos/net/connectivity_state_helper.h"

#include "chrome/browser/chromeos/net/mock_connectivity_state_helper.h"

#include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"

+#include "chrome/browser/chromeos/settings/cros_settings.h"

#include "chrome/browser/chromeos/settings/device_settings_test_helper.h"

#include "chrome/browser/io_thread.h"

#include "chrome/browser/net/predictor.h"

@@ -290,6 +291,8 @@ class LoginUtilsTest : public testing::Test,

cryptohome_client_ = mock_dbus_thread_manager_.mock_cryptohome_client();

EXPECT_CALL(*cryptohome_client_, IsMounted(_));

+ test_cros_settings_.reset(new ScopedTestCrosSettings);

browser_process_->SetProfileManager(

new ProfileManagerWithoutInit(scoped_temp_dir_.path()));

connector_ = browser_process_->browser_policy_connector();

@@ -419,7 +422,10 @@ class LoginUtilsTest : public testing::Test,

}

void PrepareProfile(const std::string& username) {

- ScopedDeviceSettingsTestHelper device_settings_test_helper;

+ DeviceSettingsTestHelper device_settings_test_helper;

+ DeviceSettingsService::Get()->SetSessionManager(

bartfab (slow) 2013/04/17 11:14:10 Nit: #include "chrome/browser/chromeos/settings/de

stevenjb 2013/04/17 16:27:12 Done.

+ &device_settings_test_helper, new MockOwnerKeyUtil());

bartfab (slow) 2013/04/17 11:14:10 Nit: #include "chrome/browser/chromeos/settings/mo

stevenjb 2013/04/17 16:27:12 Done.

MockSessionManagerClient* session_manager_client =

mock_dbus_thread_manager_.mock_session_manager_client();

EXPECT_CALL(*session_manager_client, StartSession(_));

@@ -447,6 +453,8 @@ class LoginUtilsTest : public testing::Test,

std::string(), kUsingOAuth, kHasCookies, this);

device_settings_test_helper.Flush();

RunUntilIdle();

+ DeviceSettingsService::Get()->UnsetSessionManager();

}

net::TestURLFetcher* PrepareOAuthFetcher(const std::string& expected_url) {

@@ -529,6 +537,10 @@ class LoginUtilsTest : public testing::Test,

policy::BrowserPolicyConnector* connector_;

MockCryptohomeLibrary* cryptohome_;

MockCryptohomeClient* cryptohome_client_;

+ // Initialized after |mock_dbus_thread_manager_| and |cryptohome_| are set up.

+ scoped_ptr<ScopedTestCrosSettings> test_cros_settings_;

Profile* prepared_profile_;

base::Closure rlz_initialized_cb_;