Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Side by Side Diff: chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/prefs/pref_service.h"
8 #include "base/prefs/scoped_user_pref_update.h"
9 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
10 #include "build/build_config.h" 8 #include "build/build_config.h"
11 #include "chrome/browser/content_settings/cookie_settings_factory.h" 9 #include "chrome/browser/content_settings/cookie_settings_factory.h"
12 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 10 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
13 #include "chrome/browser/signin/fake_signin_manager_builder.h" 11 #include "chrome/browser/signin/fake_signin_manager_builder.h"
14 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 12 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
15 #include "chrome/browser/signin/signin_manager_factory.h" 13 #include "chrome/browser/signin/signin_manager_factory.h"
16 #include "chrome/browser/signin/signin_promo.h" 14 #include "chrome/browser/signin/signin_promo.h"
17 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" 16 #include "chrome/browser/ui/tabs/tab_strip_model.h"
19 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" 17 #include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h"
20 #include "chrome/browser/ui/webui/signin/inline_login_ui.h" 18 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"
21 #include "chrome/browser/ui/webui/signin/login_ui_service.h" 19 #include "chrome/browser/ui/webui/signin/login_ui_service.h"
22 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h" 20 #include "chrome/browser/ui/webui/signin/login_ui_service_factory.h"
23 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h" 21 #include "chrome/browser/ui/webui/signin/login_ui_test_utils.h"
24 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
25 #include "chrome/common/url_constants.h" 23 #include "chrome/common/url_constants.h"
26 #include "chrome/grit/chromium_strings.h" 24 #include "chrome/grit/chromium_strings.h"
27 #include "chrome/grit/generated_resources.h" 25 #include "chrome/grit/generated_resources.h"
28 #include "chrome/test/base/in_process_browser_test.h" 26 #include "chrome/test/base/in_process_browser_test.h"
29 #include "chrome/test/base/test_browser_window.h" 27 #include "chrome/test/base/test_browser_window.h"
30 #include "chrome/test/base/test_chrome_web_ui_controller_factory.h" 28 #include "chrome/test/base/test_chrome_web_ui_controller_factory.h"
31 #include "chrome/test/base/testing_browser_process.h" 29 #include "chrome/test/base/testing_browser_process.h"
32 #include "chrome/test/base/ui_test_utils.h" 30 #include "chrome/test/base/ui_test_utils.h"
33 #include "components/content_settings/core/browser/cookie_settings.h" 31 #include "components/content_settings/core/browser/cookie_settings.h"
34 #include "components/guest_view/browser/guest_view_manager.h" 32 #include "components/guest_view/browser/guest_view_manager.h"
35 #include "components/keyed_service/content/browser_context_dependency_manager.h" 33 #include "components/keyed_service/content/browser_context_dependency_manager.h"
34 #include "components/prefs/pref_service.h"
35 #include "components/prefs/scoped_user_pref_update.h"
36 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h" 36 #include "components/signin/core/browser/fake_profile_oauth2_token_service.h"
37 #include "components/signin/core/browser/signin_manager.h" 37 #include "components/signin/core/browser/signin_manager.h"
38 #include "components/signin/core/common/profile_management_switches.h" 38 #include "components/signin/core/common/profile_management_switches.h"
39 #include "components/signin/core/common/signin_pref_names.h" 39 #include "components/signin/core/common/signin_pref_names.h"
40 #include "content/public/browser/render_frame_host.h" 40 #include "content/public/browser/render_frame_host.h"
41 #include "content/public/browser/render_process_host.h" 41 #include "content/public/browser/render_process_host.h"
42 #include "content/public/browser/session_storage_namespace.h" 42 #include "content/public/browser/session_storage_namespace.h"
43 #include "content/public/browser/storage_partition.h" 43 #include "content/public/browser/storage_partition.h"
44 #include "content/public/browser/web_contents.h" 44 #include "content/public/browser/web_contents.h"
45 #include "content/public/browser/web_ui_controller.h" 45 #include "content/public/browser/web_ui_controller.h"
(...skipping 831 matching lines...) Expand 10 before | Expand all | Expand 10 after
877 LoginUIServiceFactory::GetForProfile(browser()->profile()) 877 LoginUIServiceFactory::GetForProfile(browser()->profile())
878 ->AddObserver(&observer); 878 ->AddObserver(&observer);
879 base::RunLoop run_loop; 879 base::RunLoop run_loop;
880 EXPECT_CALL(observer, OnUntrustedLoginUIShown()) 880 EXPECT_CALL(observer, OnUntrustedLoginUIShown())
881 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)); 881 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
882 882
883 ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password"); 883 ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
884 run_loop.Run(); 884 run_loop.Run();
885 base::MessageLoop::current()->RunUntilIdle(); 885 base::MessageLoop::current()->RunUntilIdle();
886 } 886 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698