chrome/browser/chromeos/login/signin/oauth2_browsertest.cc - Issue 735473002: Rename app_modal_dialogs dir to app_modal

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

Issue 735473002: Rename app_modal_dialogs dir to app_modal (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: rebase Created 6 years, 1 month 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

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/devtools/devtools_sanity_browsertest.cc » ('j') | no next file with comments »

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/signin/oauth2_login_manager.h"	13 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager.h"

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

15 #include "chrome/browser/chromeos/login/signin_specifics.h"	15 #include "chrome/browser/chromeos/login/signin_specifics.h"

16 #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/wizard_controller.h"	17 #include "chrome/browser/chromeos/login/wizard_controller.h"

18 #include "chrome/browser/profiles/profile_manager.h"	18 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"	19 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"

20 #include "chrome/browser/ui/browser.h"	20 #include "chrome/browser/ui/browser.h"

21 #include "chrome/browser/ui/browser_tabstrip.h"	21 #include "chrome/browser/ui/browser_tabstrip.h"

22 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"	22 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h"

23 #include "chrome/browser/ui/tabs/tab_strip_model.h"	23 #include "chrome/browser/ui/tabs/tab_strip_model.h"

24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"	24 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

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

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

27 #include "chromeos/login/auth/key.h"	27 #include "chromeos/login/auth/key.h"

28 #include "chromeos/login/auth/user_context.h"	28 #include "chromeos/login/auth/user_context.h"

29 #include "components/app_modal_dialogs/javascript_app_modal_dialog.h"	29 #include "components/app_modal/javascript_app_modal_dialog.h"

30 #include "components/app_modal_dialogs/native_app_modal_dialog.h"	30 #include "components/app_modal/native_app_modal_dialog.h"

31 #include "components/signin/core/browser/profile_oauth2_token_service.h"	31 #include "components/signin/core/browser/profile_oauth2_token_service.h"

32 #include "components/user_manager/user.h"	32 #include "components/user_manager/user.h"

33 #include "components/user_manager/user_manager.h"	33 #include "components/user_manager/user_manager.h"

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

35 #include "content/public/test/browser_test_utils.h"	35 #include "content/public/test/browser_test_utils.h"

36 #include "extensions/browser/process_manager.h"	36 #include "extensions/browser/process_manager.h"

37 #include "extensions/test/extension_test_message_listener.h"	37 #include "extensions/test/extension_test_message_listener.h"

38 #include "extensions/test/result_catcher.h"	38 #include "extensions/test/result_catcher.h"

39 #include "google_apis/gaia/gaia_constants.h"	39 #include "google_apis/gaia/gaia_constants.h"

40 #include "google_apis/gaia/gaia_urls.h"	40 #include "google_apis/gaia/gaia_urls.h"

(...skipping 749 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
790	790

791 if (!catcher.GetNextResult()) {	791 if (!catcher.GetNextResult()) {

792 std::string message = catcher.message();	792 std::string message = catcher.message();

793 ADD_FAILURE() << "Tests failed: " << message;	793 ADD_FAILURE() << "Tests failed: " << message;

794 }	794 }

795	795

796 EXPECT_TRUE(fake_google_.IsPageRequested());	796 EXPECT_TRUE(fake_google_.IsPageRequested());

797 }	797 }

798	798

799 } // namespace chromeos	799 } // namespace chromeos

OLD	NEW