trunk/src/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc - Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos"

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/existing_user_controller_browsertest.cc

Issue 13590004: Revert 192504 "Re-apply 192420: Move login switches to src/chromeos" (Closed) Base URL: svn://svn.chromium.org/chrome/

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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc ('k') | trunk/src/chrome/browser/chromeos/login/login_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include <vector>	5 #include <vector>

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/bind_helpers.h"	8 #include "base/bind_helpers.h"

9 #include "base/callback.h"	9 #include "base/callback.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 30 matching lines...) Expand all Loading...
41 #include "chrome/browser/policy/cloud/cloud_policy_core.h"	41 #include "chrome/browser/policy/cloud/cloud_policy_core.h"

42 #include "chrome/browser/policy/cloud/cloud_policy_store.h"	42 #include "chrome/browser/policy/cloud/cloud_policy_store.h"

43 #include "chrome/browser/policy/cloud/mock_cloud_policy_store.h"	43 #include "chrome/browser/policy/cloud/mock_cloud_policy_store.h"

44 #include "chrome/browser/policy/cloud/policy_builder.h"	44 #include "chrome/browser/policy/cloud/policy_builder.h"

45 #include "chrome/common/chrome_notification_types.h"	45 #include "chrome/common/chrome_notification_types.h"

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

47 #include "chrome/common/chrome_switches.h"	47 #include "chrome/common/chrome_switches.h"

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

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

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

51 #include "chromeos/chromeos_switches.h"

52 #include "chromeos/dbus/fake_session_manager_client.h"	51 #include "chromeos/dbus/fake_session_manager_client.h"

53 #include "chromeos/dbus/mock_dbus_thread_manager.h"	52 #include "chromeos/dbus/mock_dbus_thread_manager.h"

54 #include "chromeos/dbus/mock_session_manager_client.h"	53 #include "chromeos/dbus/mock_session_manager_client.h"

55 #include "chromeos/dbus/mock_shill_manager_client.h"	54 #include "chromeos/dbus/mock_shill_manager_client.h"

56 #include "chromeos/dbus/mock_update_engine_client.h"	55 #include "chromeos/dbus/mock_update_engine_client.h"

57 #include "content/public/browser/notification_details.h"	56 #include "content/public/browser/notification_details.h"

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

59 #include "content/public/test/mock_notification_observer.h"	58 #include "content/public/test/mock_notification_observer.h"

60 #include "crypto/rsa_private_key.h"	59 #include "crypto/rsa_private_key.h"

61 #include "google_apis/gaia/mock_url_fetcher_factory.h"	60 #include "google_apis/gaia/mock_url_fetcher_factory.h"

(...skipping 751 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
813	812

814 // Wait for login tasks to complete.	813 // Wait for login tasks to complete.

815 content::RunAllPendingInMessageLoop();	814 content::RunAllPendingInMessageLoop();

816	815

817 // Timer should still be stopped after login completes.	816 // Timer should still be stopped after login completes.

818 ASSERT_TRUE(auto_login_timer());	817 ASSERT_TRUE(auto_login_timer());

819 EXPECT_FALSE(auto_login_timer()->IsRunning());	818 EXPECT_FALSE(auto_login_timer()->IsRunning());

820 }	819 }

821	820

822 } // namespace chromeos	821 } // namespace chromeos

OLD	NEW