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

Unified Diff: chrome/browser/extensions/extension_browsertest.cc

Issue 25366003: Moved some functions off ExtensionService into a new file extension_util. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Compile failures Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_browsertest.cc
diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc
index f5da8f6d0e30e196833a897f60a7fbd6965a0705..f0b3914d53eec629913edd5de9303eef8b4c797a 100644
--- a/chrome/browser/extensions/extension_browsertest.cc
+++ b/chrome/browser/extensions/extension_browsertest.cc
@@ -24,6 +24,7 @@
#include "chrome/browser/extensions/extension_install_prompt.h"
#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_util.h"
#include "chrome/browser/extensions/unpacked_installer.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_manager.h"
@@ -192,11 +193,11 @@ const Extension* ExtensionBrowserTest::LoadExtensionWithFlags(
content::WindowedNotificationObserver load_signal(
chrome::NOTIFICATION_EXTENSION_LOADED,
content::Source<Profile>(profile()));
- CHECK(!service->IsIncognitoEnabled(extension_id) ||
+ CHECK(!extension_util::IsIncognitoEnabled(extension_id, service) ||
extension->force_incognito_enabled());
if (flags & kFlagEnableIncognito) {
- service->SetIsIncognitoEnabled(extension_id, true);
+ extension_util::SetIsIncognitoEnabled(extension_id, service, true);
load_signal.Wait();
extension = service->GetExtensionById(extension_id, false);
CHECK(extension) << extension_id << " not found after reloading.";
@@ -207,9 +208,9 @@ const Extension* ExtensionBrowserTest::LoadExtensionWithFlags(
content::WindowedNotificationObserver load_signal(
chrome::NOTIFICATION_EXTENSION_LOADED,
content::Source<Profile>(profile()));
- CHECK(service->AllowFileAccess(extension));
+ CHECK(extension_util::AllowFileAccess(extension, service));
if (!(flags & kFlagEnableFileAccess)) {
- service->SetAllowFileAccess(extension, false);
+ extension_util::SetAllowFileAccess(extension, service, false);
load_signal.Wait();
extension = service->GetExtensionById(extension_id, false);
CHECK(extension) << extension_id << " not found after reloading.";
« no previous file with comments | « chrome/browser/extensions/event_router.cc ('k') | chrome/browser/extensions/extension_function_dispatcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698