| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/bind.h" | 5 #include "base/bind.h" |
| 6 #include "chrome/browser/browser_process.h" | 6 #include "chrome/browser/browser_process.h" |
| 7 #include "chrome/browser/chrome_notification_types.h" | 7 #include "chrome/browser/chrome_notification_types.h" |
| 8 #include "chrome/browser/extensions/extension_browsertest.h" | 8 #include "chrome/browser/extensions/extension_browsertest.h" |
| 9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
| 10 #include "chrome/browser/profiles/profile.h" | 10 #include "chrome/browser/profiles/profile.h" |
| 11 #include "chrome/browser/ui/browser.h" | 11 #include "chrome/browser/ui/browser.h" |
| 12 #include "chrome/browser/ui/browser_commands.h" | 12 #include "chrome/browser/ui/browser_commands.h" |
| 13 #include "chrome/test/base/ui_test_utils.h" | |
| 14 #include "content/public/browser/render_process_host.h" | 13 #include "content/public/browser/render_process_host.h" |
| 15 #include "content/public/browser/render_view_host.h" | 14 #include "content/public/browser/render_view_host.h" |
| 16 #include "content/public/browser/web_contents.h" | 15 #include "content/public/browser/web_contents.h" |
| 17 #include "content/public/common/url_constants.h" | 16 #include "content/public/common/url_constants.h" |
| 18 #include "content/public/test/browser_test_utils.h" | 17 #include "content/public/test/browser_test_utils.h" |
| 19 #include "extensions/browser/extension_host.h" | 18 #include "extensions/browser/extension_host.h" |
| 20 #include "extensions/browser/extension_system.h" | 19 #include "extensions/browser/extension_system.h" |
| 21 #include "extensions/browser/process_manager.h" | 20 #include "extensions/browser/process_manager.h" |
| 22 #include "extensions/common/constants.h" | 21 #include "extensions/common/constants.h" |
| 23 | 22 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 84 }; | 83 }; |
| 85 | 84 |
| 86 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { | 85 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { |
| 87 content::WindowedNotificationObserver panel_loaded( | 86 content::WindowedNotificationObserver panel_loaded( |
| 88 extensions::NOTIFICATION_EXTENSION_VIEW_REGISTERED, | 87 extensions::NOTIFICATION_EXTENSION_VIEW_REGISTERED, |
| 89 content::NotificationService::AllSources()); | 88 content::NotificationService::AllSources()); |
| 90 InstallGtalkExtension(ReadCurrentVersion()); | 89 InstallGtalkExtension(ReadCurrentVersion()); |
| 91 panel_loaded.Wait(); | 90 panel_loaded.Wait(); |
| 92 ASSERT_TRUE(GetViewer()); | 91 ASSERT_TRUE(GetViewer()); |
| 93 } | 92 } |
| OLD | NEW |