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

Unified Diff: chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

Issue 2807683003: Prevent loading of session extensions into the sign-in profile (Closed)
Patch Set: Fix the condition Created 3 years, 8 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/chromeos/file_manager/file_manager_browsertest_base.cc
diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
index ebab6deb3343cfdc49b8304c44af0ec9eeaa5c3b..e1769d3fad43d4ab11488be0719c5f0eebabbb6f 100644
--- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
+++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc
@@ -17,10 +17,13 @@
#include "base/time/time.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/drive/file_system_util.h"
+#include "chrome/browser/chromeos/file_manager/app_id.h"
#include "chrome/browser/chromeos/file_manager/mount_test_util.h"
#include "chrome/browser/chromeos/file_manager/path_util.h"
#include "chrome/browser/chromeos/file_manager/volume_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/extensions/component_loader.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/browser/notifications/notification.h"
#include "chrome/browser/notifications/notification_ui_manager.h"
#include "chrome/common/chrome_switches.h"
@@ -30,6 +33,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_utils.h"
#include "extensions/browser/api/test/test_api.h"
+#include "extensions/browser/extension_system.h"
#include "extensions/browser/notification_types.h"
#include "google_apis/drive/drive_api_parser.h"
#include "google_apis/drive/test_util.h"
@@ -525,6 +529,18 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
ExtensionApiTest::SetUpOnMainThread();
ASSERT_TRUE(local_volume_->Mount(profile()));
+ // The file manager component app should have been added for loading into the
+ // user profile, but not into the sign-in profile.
+ ASSERT_TRUE(extensions::ExtensionSystem::Get(profile())
+ ->extension_service()
+ ->component_loader()
+ ->Exists(kFileManagerAppId));
+ ASSERT_FALSE(extensions::ExtensionSystem::Get(
+ chromeos::ProfileHelper::GetSigninProfile())
+ ->extension_service()
+ ->component_loader()
+ ->Exists(kFileManagerAppId));
+
if (GetGuestModeParam() != IN_GUEST_MODE) {
// Install the web server to serve the mocked share dialog.
ASSERT_TRUE(embedded_test_server()->Start());
« no previous file with comments | « no previous file | chrome/browser/extensions/extension_system_impl.cc » ('j') | chrome/browser/extensions/extension_system_impl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698