| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/browser/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 return false; | 154 return false; |
| 155 } | 155 } |
| 156 | 156 |
| 157 return WaitForExtensionHostsToLoad(); | 157 return WaitForExtensionHostsToLoad(); |
| 158 } | 158 } |
| 159 | 159 |
| 160 void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) { | 160 void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) { |
| 161 ExtensionsService* service = browser()->profile()->GetExtensionsService(); | 161 ExtensionsService* service = browser()->profile()->GetExtensionsService(); |
| 162 service->ReloadExtension(extension_id); | 162 service->ReloadExtension(extension_id); |
| 163 ui_test_utils::RegisterAndWait(this, | 163 ui_test_utils::RegisterAndWait(this, |
| 164 NotificationType::EXTENSION_PROCESS_CREATED, | 164 NotificationType::EXTENSION_LOADED, |
| 165 NotificationService::AllSources()); | 165 NotificationService::AllSources()); |
| 166 } | 166 } |
| 167 | 167 |
| 168 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) { | 168 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) { |
| 169 ExtensionsService* service = browser()->profile()->GetExtensionsService(); | 169 ExtensionsService* service = browser()->profile()->GetExtensionsService(); |
| 170 service->UnloadExtension(extension_id); | 170 service->UnloadExtension(extension_id); |
| 171 } | 171 } |
| 172 | 172 |
| 173 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) { | 173 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) { |
| 174 ExtensionsService* service = browser()->profile()->GetExtensionsService(); | 174 ExtensionsService* service = browser()->profile()->GetExtensionsService(); |
| (...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 MessageLoopForUI::current()->Quit(); | 342 MessageLoopForUI::current()->Quit(); |
| 343 } | 343 } |
| 344 break; | 344 break; |
| 345 } | 345 } |
| 346 | 346 |
| 347 default: | 347 default: |
| 348 NOTREACHED(); | 348 NOTREACHED(); |
| 349 break; | 349 break; |
| 350 } | 350 } |
| 351 } | 351 } |
| OLD | NEW |