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_host.h" | 9 #include "chrome/browser/extensions/extension_host.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
11 #include "chrome/browser/extensions/extension_system.h" | |
12 #include "chrome/browser/profiles/profile.h" | 11 #include "chrome/browser/profiles/profile.h" |
13 #include "chrome/browser/ui/browser.h" | 12 #include "chrome/browser/ui/browser.h" |
14 #include "chrome/browser/ui/browser_commands.h" | 13 #include "chrome/browser/ui/browser_commands.h" |
15 #include "chrome/test/base/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
16 #include "content/public/browser/render_process_host.h" | 15 #include "content/public/browser/render_process_host.h" |
17 #include "content/public/browser/render_view_host.h" | 16 #include "content/public/browser/render_view_host.h" |
18 #include "content/public/browser/web_contents.h" | 17 #include "content/public/browser/web_contents.h" |
19 #include "content/public/test/browser_test_utils.h" | 18 #include "content/public/test/browser_test_utils.h" |
| 19 #include "extensions/browser/extension_system.h" |
20 #include "extensions/browser/process_manager.h" | 20 #include "extensions/browser/process_manager.h" |
21 | 21 |
22 using content::RenderViewHost; | 22 using content::RenderViewHost; |
23 using content::WebContents; | 23 using content::WebContents; |
24 using extensions::Extension; | 24 using extensions::Extension; |
25 | 25 |
26 class GtalkExtensionTest : public ExtensionBrowserTest { | 26 class GtalkExtensionTest : public ExtensionBrowserTest { |
27 protected: | 27 protected: |
28 extensions::ProcessManager* GetProcessManager() { | 28 extensions::ProcessManager* GetProcessManager() { |
29 return extensions::ExtensionSystem::Get(browser()->profile())-> | 29 return extensions::ExtensionSystem::Get(browser()->profile())-> |
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 }; | 80 }; |
81 | 81 |
82 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { | 82 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { |
83 content::WindowedNotificationObserver panel_loaded( | 83 content::WindowedNotificationObserver panel_loaded( |
84 chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED, | 84 chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED, |
85 content::NotificationService::AllSources()); | 85 content::NotificationService::AllSources()); |
86 InstallGtalkExtension(ReadCurrentVersion()); | 86 InstallGtalkExtension(ReadCurrentVersion()); |
87 panel_loaded.Wait(); | 87 panel_loaded.Wait(); |
88 ASSERT_TRUE(GetViewer()); | 88 ASSERT_TRUE(GetViewer()); |
89 } | 89 } |
OLD | NEW |