chrome/browser/chromeos/login/existing_user_controller_browsertest.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/login/existing_user_controller_browsertest.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: _ Created 8 years, 9 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/login/existing_user_controller_browsertest.cc

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

index 8887e6ee6725a3ade1541c850b0067e0821d70fb..ed0ff5ef91abd242a079cabb8debfebe2f505561 100644

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

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

@@ -6,12 +6,10 @@

#include "base/compiler_specific.h"

#include "base/memory/scoped_ptr.h"

#include "base/message_loop.h"

-#include "chrome/browser/chromeos/cros/cros_mock.h"

#include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"

+#include "chrome/browser/chromeos/cros/cros_mock.h"

#include "chrome/browser/chromeos/cros/mock_cryptohome_library.h"

#include "chrome/browser/chromeos/cros/mock_network_library.h"

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

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

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

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

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

@@ -27,6 +25,8 @@

#include "chrome/common/net/gaia/mock_url_fetcher_factory.h"

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

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

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

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

#include "grit/generated_resources.h"

#include "testing/gmock/include/gmock/gmock.h"

#include "testing/gtest/include/gtest/gtest.h"

« no previous file with comments | « chrome/browser/chromeos/login/existing_user_controller.cc ('k') | chrome/browser/chromeos/login/login_performer.cc » ('j') | chromeos/dbus/DEPS » ('J')