| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 288 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 299 void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) { | 299 void ExtensionBrowserTest::ReloadExtension(const std::string& extension_id) { |
| 300 ExtensionService* service = browser()->profile()->GetExtensionService(); | 300 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 301 service->ReloadExtension(extension_id); | 301 service->ReloadExtension(extension_id); |
| 302 ui_test_utils::RegisterAndWait(this, | 302 ui_test_utils::RegisterAndWait(this, |
| 303 chrome::NOTIFICATION_EXTENSION_LOADED, | 303 chrome::NOTIFICATION_EXTENSION_LOADED, |
| 304 NotificationService::AllSources()); | 304 NotificationService::AllSources()); |
| 305 } | 305 } |
| 306 | 306 |
| 307 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) { | 307 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) { |
| 308 ExtensionService* service = browser()->profile()->GetExtensionService(); | 308 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 309 service->UnloadExtension(extension_id, UnloadedExtensionInfo::DISABLE); | 309 service->UnloadExtension(extension_id, extension_misc::UNLOAD_REASON_DISABLE); |
| 310 } | 310 } |
| 311 | 311 |
| 312 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) { | 312 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) { |
| 313 ExtensionService* service = browser()->profile()->GetExtensionService(); | 313 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 314 service->UninstallExtension(extension_id, false, NULL); | 314 service->UninstallExtension(extension_id, false, NULL); |
| 315 } | 315 } |
| 316 | 316 |
| 317 void ExtensionBrowserTest::DisableExtension(const std::string& extension_id) { | 317 void ExtensionBrowserTest::DisableExtension(const std::string& extension_id) { |
| 318 ExtensionService* service = browser()->profile()->GetExtensionService(); | 318 ExtensionService* service = browser()->profile()->GetExtensionService(); |
| 319 service->DisableExtension(extension_id); | 319 service->DisableExtension(extension_id); |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 MessageLoopForUI::current()->Quit(); | 474 MessageLoopForUI::current()->Quit(); |
| 475 } | 475 } |
| 476 break; | 476 break; |
| 477 } | 477 } |
| 478 | 478 |
| 479 default: | 479 default: |
| 480 NOTREACHED(); | 480 NOTREACHED(); |
| 481 break; | 481 break; |
| 482 } | 482 } |
| 483 } | 483 } |
| OLD | NEW |