| OLD | NEW |
| 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 "chrome/test/remoting/remote_desktop_browsertest.h" | 5 #include "chrome/test/remoting/remote_desktop_browsertest.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/extensions/extension_service.h" | 8 #include "chrome/browser/extensions/extension_service.h" |
| 9 #include "chrome/browser/extensions/unpacked_installer.h" | 9 #include "chrome/browser/extensions/unpacked_installer.h" |
| 10 #include "chrome/browser/ui/extensions/application_launch.h" | 10 #include "chrome/browser/ui/extensions/application_launch.h" |
| (...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 110 } | 110 } |
| 111 | 111 |
| 112 void RemoteDesktopBrowserTest::InstallChromotingAppUnpacked() { | 112 void RemoteDesktopBrowserTest::InstallChromotingAppUnpacked() { |
| 113 ASSERT_TRUE(is_unpacked()); | 113 ASSERT_TRUE(is_unpacked()); |
| 114 | 114 |
| 115 scoped_refptr<extensions::UnpackedInstaller> installer = | 115 scoped_refptr<extensions::UnpackedInstaller> installer = |
| 116 extensions::UnpackedInstaller::Create(extension_service()); | 116 extensions::UnpackedInstaller::Create(extension_service()); |
| 117 installer->set_prompt_for_plugins(false); | 117 installer->set_prompt_for_plugins(false); |
| 118 | 118 |
| 119 content::WindowedNotificationObserver observer( | 119 content::WindowedNotificationObserver observer( |
| 120 chrome::NOTIFICATION_EXTENSION_LOADED, | 120 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED, |
| 121 content::NotificationService::AllSources()); | 121 content::NotificationService::AllSources()); |
| 122 | 122 |
| 123 installer->Load(webapp_unpacked_); | 123 installer->Load(webapp_unpacked_); |
| 124 | 124 |
| 125 observer.Wait(); | 125 observer.Wait(); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void RemoteDesktopBrowserTest::UninstallChromotingApp() { | 128 void RemoteDesktopBrowserTest::UninstallChromotingApp() { |
| 129 UninstallExtension(ChromotingID()); | 129 UninstallExtension(ChromotingID()); |
| 130 extension_ = NULL; | 130 extension_ = NULL; |
| (...skipping 598 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 729 // static | 729 // static |
| 730 bool RemoteDesktopBrowserTest::IsHostActionComplete( | 730 bool RemoteDesktopBrowserTest::IsHostActionComplete( |
| 731 content::WebContents* client_web_content, | 731 content::WebContents* client_web_content, |
| 732 std::string host_action_var) { | 732 std::string host_action_var) { |
| 733 return ExecuteScriptAndExtractBool( | 733 return ExecuteScriptAndExtractBool( |
| 734 client_web_content, | 734 client_web_content, |
| 735 host_action_var); | 735 host_action_var); |
| 736 } | 736 } |
| 737 | 737 |
| 738 } // namespace remoting | 738 } // namespace remoting |
| OLD | NEW |