chrome/browser/chromeos/login/signin/oauth2_browsertest.cc - Issue 290513003: Move UserContext to its own file

Side by Side Diff: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

Issue 290513003: Move UserContext to its own file (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebased. Created 6 years, 7 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

OLD	NEW
1 // Copyright 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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 <string>	5 #include <string>

6	6

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

9 #include "base/strings/stringprintf.h"	9 #include "base/strings/stringprintf.h"

10 #include "base/synchronization/waitable_event.h"	10 #include "base/synchronization/waitable_event.h"

11 #include "chrome/browser/browser_process.h"	11 #include "chrome/browser/browser_process.h"

12 #include "chrome/browser/chrome_notification_types.h"	12 #include "chrome/browser/chrome_notification_types.h"

	13 #include "chrome/browser/chromeos/login/auth/user_context.h"

13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"	14 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

14 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"	15 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"

15 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"	16 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"

	17 #include "chrome/browser/chromeos/login/users/user.h"

16 #include "chrome/browser/chromeos/login/users/user_manager.h"	18 #include "chrome/browser/chromeos/login/users/user_manager.h"

17 #include "chrome/browser/chromeos/login/wizard_controller.h"	19 #include "chrome/browser/chromeos/login/wizard_controller.h"

18 #include "chrome/browser/extensions/extension_test_message_listener.h"	20 #include "chrome/browser/extensions/extension_test_message_listener.h"

19 #include "chrome/browser/profiles/profile_manager.h"	21 #include "chrome/browser/profiles/profile_manager.h"

20 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	22 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

21 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"	23 #include "chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h"

22 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"	24 #include "chrome/browser/ui/app_modal_dialogs/native_app_modal_dialog.h"

23 #include "chrome/browser/ui/browser.h"	25 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_tabstrip.h"	26 #include "chrome/browser/ui/browser_tabstrip.h"

25 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"	27 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

(...skipping 746 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
772	774

773 if (!catcher.GetNextResult()) {	775 if (!catcher.GetNextResult()) {

774 std::string message = catcher.message();	776 std::string message = catcher.message();

775 ADD_FAILURE() << "Tests failed: " << message;	777 ADD_FAILURE() << "Tests failed: " << message;

776 }	778 }

777	779

778 EXPECT_TRUE(fake_google_.IsPageRequested());	780 EXPECT_TRUE(fake_google_.IsPageRequested());

779 }	781 }

780	782

781 } // namespace chromeos	783 } // namespace chromeos

OLD	NEW