chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc - Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

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/kiosk_mode/kiosk_mode_screensaver_unittest.cc

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Rebase Created 8 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/kiosk_mode/kiosk_mode_screensaver.cc ('k') | chrome/browser/chromeos/login/base_login_display_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

diff --git a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

index 08ec40a6b888a7d4b953dd11e591d06e5f436fab..3ad811361147b6bb16358f1d9d6826a372942c23 100644

--- a/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

+++ b/chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver_unittest.cc

@@ -8,11 +8,11 @@

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

#include "base/synchronization/waitable_event.h"

-#include "chrome/browser/chromeos/dbus/mock_dbus_thread_manager.h"

-#include "chrome/browser/chromeos/dbus/mock_power_manager_client.h"

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

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/extensions/extension.h"

+#include "chromeos/dbus/mock_dbus_thread_manager.h"

+#include "chromeos/dbus/mock_power_manager_client.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_registrar.h"

#include "content/public/browser/notification_service.h"