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

Unified Diff: chrome/browser/permissions/permission_manager_unittest.cc

Issue 2446863002: Revert of Add threadsafe version of PermissionManager::GetPermissionStatus (Closed)
Patch Set: Created 4 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
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/permissions/permission_manager_unittest.cc
diff --git a/chrome/browser/permissions/permission_manager_unittest.cc b/chrome/browser/permissions/permission_manager_unittest.cc
index 93743fb48fd3042f82edfec7252383444eafdeec..ae115f8eb3263488030346ec37bacd1a2cc08b31 100644
--- a/chrome/browser/permissions/permission_manager_unittest.cc
+++ b/chrome/browser/permissions/permission_manager_unittest.cc
@@ -5,14 +5,11 @@
#include "chrome/browser/permissions/permission_manager.h"
#include "base/macros.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
#include "build/build_config.h"
#include "chrome/browser/content_settings/host_content_settings_map_factory.h"
#include "chrome/browser/permissions/permission_manager_factory.h"
#include "chrome/test/base/testing_profile.h"
#include "components/content_settings/core/browser/host_content_settings_map.h"
-#include "content/public/browser/browser_thread.h"
#include "content/public/browser/permission_type.h"
#include "content/public/test/test_browser_thread_bundle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -43,42 +40,30 @@
callback_result_ = permission;
}
- void TestGetPermissionStatus();
-
protected:
PermissionManagerTest()
- : thread_bundle_(content::TestBrowserThreadBundle::REAL_IO_THREAD),
- url_("https://example.com"),
+ : url_("https://example.com"),
other_url_("https://foo.com"),
callback_called_(false),
- callback_result_(PermissionStatus::ASK) {
- host_content_settings_map_ =
- HostContentSettingsMapFactory::GetForProfile(&profile_);
- }
+ callback_result_(PermissionStatus::ASK) {}
PermissionManager* GetPermissionManager() {
return profile_.GetPermissionManager();
}
HostContentSettingsMap* GetHostContentSettingsMap() {
- return host_content_settings_map_;
+ return HostContentSettingsMapFactory::GetForProfile(&profile_);
}
void CheckPermissionStatus(PermissionType type,
PermissionStatus expected) {
- if (content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)) {
- EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus(
- type, url_.GetOrigin(), url_.GetOrigin()));
- } else {
- EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus(
- host_content_settings_map_, type,
- url_.GetOrigin(), url_.GetOrigin()));
- }
+ EXPECT_EQ(expected, GetPermissionManager()->GetPermissionStatus(
+ type, url_.GetOrigin(), url_.GetOrigin()));
}
void SetPermission(ContentSettingsType type, ContentSetting value) {
- GetHostContentSettingsMap()->SetContentSettingDefaultScope(
- url_, url_, type, std::string(), value);
+ HostContentSettingsMapFactory::GetForProfile(&profile_)
+ ->SetContentSettingDefaultScope(url_, url_, type, std::string(), value);
}
const GURL& url() const {
@@ -101,16 +86,15 @@
}
private:
- content::TestBrowserThreadBundle thread_bundle_;
const GURL url_;
const GURL other_url_;
bool callback_called_;
PermissionStatus callback_result_;
+ content::TestBrowserThreadBundle thread_bundle_;
PermissionManagerTestingProfile profile_;
- HostContentSettingsMap* host_content_settings_map_;
};
-void PermissionManagerTest::TestGetPermissionStatus() {
+TEST_F(PermissionManagerTest, GetPermissionStatusDefault) {
CheckPermissionStatus(PermissionType::MIDI_SYSEX, PermissionStatus::ASK);
CheckPermissionStatus(PermissionType::PUSH_MESSAGING, PermissionStatus::ASK);
CheckPermissionStatus(PermissionType::NOTIFICATIONS, PermissionStatus::ASK);
@@ -121,20 +105,6 @@
#endif
}
-TEST_F(PermissionManagerTest, GetPermissionStatusDefault) {
- TestGetPermissionStatus();
-}
-
-TEST_F(PermissionManagerTest, GetPermissionStatusNonMainThread) {
- base::RunLoop run_loop;
- content::BrowserThread::PostTaskAndReply(
- content::BrowserThread::IO, FROM_HERE,
- base::Bind(&PermissionManagerTest::TestGetPermissionStatus,
- base::Unretained(this)),
- run_loop.QuitClosure());
- run_loop.Run();
-}
-
TEST_F(PermissionManagerTest, GetPermissionStatusAfterSet) {
SetPermission(CONTENT_SETTINGS_TYPE_GEOLOCATION, CONTENT_SETTING_ALLOW);
CheckPermissionStatus(PermissionType::GEOLOCATION, PermissionStatus::GRANTED);
« no previous file with comments | « chrome/browser/permissions/permission_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698