| 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" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 #include "chrome/browser/ui/browser_tabstrip.h" | 22 #include "chrome/browser/ui/browser_tabstrip.h" |
| 23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 23 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 24 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 25 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" | 25 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h" |
| 26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
| 27 #include "chrome/test/base/ui_test_utils.h" | 27 #include "chrome/test/base/ui_test_utils.h" |
| 28 #include "chromeos/login/auth/key.h" | 28 #include "chromeos/login/auth/key.h" |
| 29 #include "chromeos/login/auth/user_context.h" | 29 #include "chromeos/login/auth/user_context.h" |
| 30 #include "components/app_modal/javascript_app_modal_dialog.h" | 30 #include "components/app_modal/javascript_app_modal_dialog.h" |
| 31 #include "components/app_modal/native_app_modal_dialog.h" | 31 #include "components/app_modal/native_app_modal_dialog.h" |
| 32 #include "components/browser_sync/common/browser_sync_switches.h" |
| 32 #include "components/signin/core/account_id/account_id.h" | 33 #include "components/signin/core/account_id/account_id.h" |
| 33 #include "components/signin/core/browser/account_tracker_service.h" | 34 #include "components/signin/core/browser/account_tracker_service.h" |
| 34 #include "components/signin/core/browser/profile_oauth2_token_service.h" | 35 #include "components/signin/core/browser/profile_oauth2_token_service.h" |
| 35 #include "components/user_manager/user.h" | 36 #include "components/user_manager/user.h" |
| 36 #include "components/user_manager/user_manager.h" | 37 #include "components/user_manager/user_manager.h" |
| 37 #include "content/public/browser/notification_service.h" | 38 #include "content/public/browser/notification_service.h" |
| 38 #include "content/public/test/browser_test_utils.h" | 39 #include "content/public/test/browser_test_utils.h" |
| 39 #include "extensions/browser/process_manager.h" | 40 #include "extensions/browser/process_manager.h" |
| 40 #include "extensions/test/extension_test_message_listener.h" | 41 #include "extensions/test/extension_test_message_listener.h" |
| 41 #include "extensions/test/result_catcher.h" | 42 #include "extensions/test/result_catcher.h" |
| (...skipping 764 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 806 | 807 |
| 807 if (!catcher.GetNextResult()) { | 808 if (!catcher.GetNextResult()) { |
| 808 std::string message = catcher.message(); | 809 std::string message = catcher.message(); |
| 809 ADD_FAILURE() << "Tests failed: " << message; | 810 ADD_FAILURE() << "Tests failed: " << message; |
| 810 } | 811 } |
| 811 | 812 |
| 812 EXPECT_TRUE(fake_google_.IsPageRequested()); | 813 EXPECT_TRUE(fake_google_.IsPageRequested()); |
| 813 } | 814 } |
| 814 | 815 |
| 815 } // namespace chromeos | 816 } // namespace chromeos |
| OLD | NEW |