Commit 9b913e53 authored by Dominick Ng's avatar Dominick Ng Committed by Commit Bot

Add missing unit test initialization in DeviceStatusCollectorTest.

Unlike CloudPrintProxyPolicyStartupTest, which similarly is a unit test
running in the browser_tests binary, DeviceStatusCollectorTest does not
initialize a ContentClient or a BrowserContentClient. This is causing
tests to fail while trying to land crrev.com/c/1157704, where a new
AfterStartupTask that eventually calls into a nullptr
BrowserContentClient while running this seemingly unrelated test.

BUG=None

Change-Id: Ibb4c4a9d4b8d8ecf2e243a81158341824ef4cda1
Reviewed-on: https://chromium-review.googlesource.com/1160072
Commit-Queue: Dominick Ng <dominickn@chromium.org>
Reviewed-by: default avatarMaksim Ivanov <emaxx@chromium.org>
Cr-Commit-Position: refs/heads/master@{#580523}
parent 90944747
......@@ -24,6 +24,7 @@
#include "base/test/scoped_feature_list.h"
#include "base/test/scoped_path_override.h"
#include "base/threading/thread_task_runner_handle.h"
#include "chrome/browser/chrome_content_browser_client.h"
#include "chrome/browser/chromeos/app_mode/arc/arc_kiosk_app_manager.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_data.h"
#include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
......@@ -34,6 +35,7 @@
#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
#include "chrome/browser/chromeos/settings/stub_install_attributes.h"
#include "chrome/common/chrome_content_client.h"
#include "chrome/common/chrome_features.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/common/pref_names.h"
......@@ -64,6 +66,7 @@
#include "components/user_manager/scoped_user_manager.h"
#include "components/user_manager/user_type.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/content_client.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_utils.h"
#include "storage/browser/fileapi/external_mount_points.h"
......@@ -321,6 +324,9 @@ class DeviceStatusCollectorTest : public testing::Test {
ChromeUnitTestSuite::InitializeProviders();
ChromeUnitTestSuite::InitializeResourceBundle();
content::SetContentClient(&content_client_);
content::SetBrowserClientForTesting(&browser_content_client_);
// Run this test with a well-known timezone so that Time::LocalMidnight()
// returns the same values on all machines.
std::unique_ptr<base::Environment> env(base::Environment::Create());
......@@ -557,6 +563,8 @@ class DeviceStatusCollectorTest : public testing::Test {
TestingBrowserProcessInitializer initializer_;
content::TestBrowserThreadBundle test_browser_thread_bundle_;
ChromeContentClient content_client_;
ChromeContentBrowserClient browser_content_client_;
chromeos::ScopedStubInstallAttributes install_attributes_;
chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
DiskMountManager::MountPointMap mount_point_map_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment