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" |
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
78 &response)); | 78 &response)); |
79 return response; | 79 return response; |
80 } | 80 } |
81 | 81 |
82 private: | 82 private: |
83 std::string installed_extension_id_; | 83 std::string installed_extension_id_; |
84 }; | 84 }; |
85 | 85 |
86 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { | 86 IN_PROC_BROWSER_TEST_F(GtalkExtensionTest, InstallCurrent) { |
87 content::WindowedNotificationObserver panel_loaded( | 87 content::WindowedNotificationObserver panel_loaded( |
88 chrome::NOTIFICATION_EXTENSION_VIEW_REGISTERED, | 88 extensions::NOTIFICATION_EXTENSION_VIEW_REGISTERED, |
89 content::NotificationService::AllSources()); | 89 content::NotificationService::AllSources()); |
90 InstallGtalkExtension(ReadCurrentVersion()); | 90 InstallGtalkExtension(ReadCurrentVersion()); |
91 panel_loaded.Wait(); | 91 panel_loaded.Wait(); |
92 ASSERT_TRUE(GetViewer()); | 92 ASSERT_TRUE(GetViewer()); |
93 } | 93 } |
OLD | NEW |