Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(108)

Side by Side Diff: trunk/src/chrome/browser/extensions/extension_browsertest.cc

Issue 369863002: Revert 281130 "Replace "external_install" boolean parameter with..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_util.h" 10 #include "base/file_util.h"
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
544 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) { 544 void ExtensionBrowserTest::UnloadExtension(const std::string& extension_id) {
545 ExtensionService* service = extensions::ExtensionSystem::Get( 545 ExtensionService* service = extensions::ExtensionSystem::Get(
546 profile())->extension_service(); 546 profile())->extension_service();
547 service->UnloadExtension(extension_id, 547 service->UnloadExtension(extension_id,
548 extensions::UnloadedExtensionInfo::REASON_DISABLE); 548 extensions::UnloadedExtensionInfo::REASON_DISABLE);
549 } 549 }
550 550
551 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) { 551 void ExtensionBrowserTest::UninstallExtension(const std::string& extension_id) {
552 ExtensionService* service = extensions::ExtensionSystem::Get( 552 ExtensionService* service = extensions::ExtensionSystem::Get(
553 profile())->extension_service(); 553 profile())->extension_service();
554 service->UninstallExtension( 554 service->UninstallExtension(extension_id, false, NULL);
555 extension_id, ExtensionService::UNINSTALL_REASON_FOR_TESTING, NULL);
556 } 555 }
557 556
558 void ExtensionBrowserTest::DisableExtension(const std::string& extension_id) { 557 void ExtensionBrowserTest::DisableExtension(const std::string& extension_id) {
559 ExtensionService* service = extensions::ExtensionSystem::Get( 558 ExtensionService* service = extensions::ExtensionSystem::Get(
560 profile())->extension_service(); 559 profile())->extension_service();
561 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION); 560 service->DisableExtension(extension_id, Extension::DISABLE_USER_ACTION);
562 } 561 }
563 562
564 void ExtensionBrowserTest::EnableExtension(const std::string& extension_id) { 563 void ExtensionBrowserTest::EnableExtension(const std::string& extension_id) {
565 ExtensionService* service = extensions::ExtensionSystem::Get( 564 ExtensionService* service = extensions::ExtensionSystem::Get(
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
642 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( 641 return extensions::browsertest_util::ExecuteScriptInBackgroundPage(
643 profile(), extension_id, script); 642 profile(), extension_id, script);
644 } 643 }
645 644
646 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( 645 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait(
647 const std::string& extension_id, 646 const std::string& extension_id,
648 const std::string& script) { 647 const std::string& script) {
649 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( 648 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait(
650 profile(), extension_id, script); 649 profile(), extension_id, script);
651 } 650 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698