chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc - Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

Issue 14192016: Move OS_CHROMEOS-specific paths to chromeos/chromeos_paths.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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

« no previous file with comments | « chrome/browser/chromeos/system/automatic_reboot_manager.cc ('k') | chrome/browser/policy/browser_policy_connector.cc » ('j') | chrome/common/chrome_paths.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

diff --git a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

index c3ec44e2a0c303e2eae2e2f0cdd0388ec9b937cc..7f90f51f0818092d1dac14ecde70b2a98b2ad49c 100644

--- a/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

+++ b/chrome/browser/chromeos/system/automatic_reboot_manager_unittest.cc

@@ -28,9 +28,9 @@

#include "base/values.h"

#include "chrome/browser/chromeos/login/mock_user_manager.h"

#include "chrome/common/chrome_notification_types.h"

-#include "chrome/common/chrome_paths.h"

#include "chrome/common/pref_names.h"

#include "chrome/test/base/testing_browser_process.h"

+#include "chromeos/chromeos_paths.h"

#include "chromeos/dbus/dbus_thread_manager.h"

#include "chromeos/dbus/mock_dbus_thread_manager.h"

#include "chromeos/dbus/mock_power_manager_client.h"

@@ -337,8 +337,8 @@ void AutomaticRebootManagerBasicTest::SetUp() {

temp_dir.Append("update_reboot_needed_uptime");

ASSERT_FALSE(file_util::WriteFile(

update_reboot_needed_uptime_file_, NULL, 0));

- ASSERT_TRUE(PathService::Override(chrome::FILE_UPTIME, uptime_file));

- ASSERT_TRUE(PathService::Override(chrome::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

+ ASSERT_TRUE(PathService::Override(chromeos::FILE_UPTIME, uptime_file));

+ ASSERT_TRUE(PathService::Override(chromeos::FILE_UPDATE_REBOOT_NEEDED_UPTIME,

update_reboot_needed_uptime_file_));

TestingBrowserProcess::GetGlobal()->SetLocalState(&local_state_);