| OLD | NEW |
| 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_prefs_unittest.h" | 5 #include "chrome/browser/extensions/./extension_prefs_unittest.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
| 9 #include "base/path_service.h" | 9 #include "base/path_service.h" |
| 10 #include "base/prefs/mock_pref_change_callback.h" | 10 #include "base/prefs/mock_pref_change_callback.h" |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 message_loop_.RunUntilIdle(); | 67 message_loop_.RunUntilIdle(); |
| 68 } | 68 } |
| 69 | 69 |
| 70 // Tests the LastPingDay/SetLastPingDay functions. | 70 // Tests the LastPingDay/SetLastPingDay functions. |
| 71 class ExtensionPrefsLastPingDay : public ExtensionPrefsTest { | 71 class ExtensionPrefsLastPingDay : public ExtensionPrefsTest { |
| 72 public: | 72 public: |
| 73 ExtensionPrefsLastPingDay() | 73 ExtensionPrefsLastPingDay() |
| 74 : extension_time_(Time::Now() - TimeDelta::FromHours(4)), | 74 : extension_time_(Time::Now() - TimeDelta::FromHours(4)), |
| 75 blacklist_time_(Time::Now() - TimeDelta::FromHours(2)) {} | 75 blacklist_time_(Time::Now() - TimeDelta::FromHours(2)) {} |
| 76 | 76 |
| 77 virtual void Initialize() OVERRIDE { | 77 virtual void Initialize() override { |
| 78 extension_id_ = prefs_.AddExtensionAndReturnId("last_ping_day"); | 78 extension_id_ = prefs_.AddExtensionAndReturnId("last_ping_day"); |
| 79 EXPECT_TRUE(prefs()->LastPingDay(extension_id_).is_null()); | 79 EXPECT_TRUE(prefs()->LastPingDay(extension_id_).is_null()); |
| 80 prefs()->SetLastPingDay(extension_id_, extension_time_); | 80 prefs()->SetLastPingDay(extension_id_, extension_time_); |
| 81 prefs()->SetBlacklistLastPingDay(blacklist_time_); | 81 prefs()->SetBlacklistLastPingDay(blacklist_time_); |
| 82 } | 82 } |
| 83 | 83 |
| 84 virtual void Verify() OVERRIDE { | 84 virtual void Verify() override { |
| 85 Time result = prefs()->LastPingDay(extension_id_); | 85 Time result = prefs()->LastPingDay(extension_id_); |
| 86 EXPECT_FALSE(result.is_null()); | 86 EXPECT_FALSE(result.is_null()); |
| 87 EXPECT_TRUE(result == extension_time_); | 87 EXPECT_TRUE(result == extension_time_); |
| 88 result = prefs()->BlacklistLastPingDay(); | 88 result = prefs()->BlacklistLastPingDay(); |
| 89 EXPECT_FALSE(result.is_null()); | 89 EXPECT_FALSE(result.is_null()); |
| 90 EXPECT_TRUE(result == blacklist_time_); | 90 EXPECT_TRUE(result == blacklist_time_); |
| 91 } | 91 } |
| 92 | 92 |
| 93 private: | 93 private: |
| 94 Time extension_time_; | 94 Time extension_time_; |
| 95 Time blacklist_time_; | 95 Time blacklist_time_; |
| 96 std::string extension_id_; | 96 std::string extension_id_; |
| 97 }; | 97 }; |
| 98 TEST_F(ExtensionPrefsLastPingDay, LastPingDay) {} | 98 TEST_F(ExtensionPrefsLastPingDay, LastPingDay) {} |
| 99 | 99 |
| 100 // Tests the GetToolbarOrder/SetToolbarOrder functions. | 100 // Tests the GetToolbarOrder/SetToolbarOrder functions. |
| 101 class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest { | 101 class ExtensionPrefsToolbarOrder : public ExtensionPrefsTest { |
| 102 public: | 102 public: |
| 103 virtual void Initialize() OVERRIDE { | 103 virtual void Initialize() override { |
| 104 list_.push_back(prefs_.AddExtensionAndReturnId("1")); | 104 list_.push_back(prefs_.AddExtensionAndReturnId("1")); |
| 105 list_.push_back(prefs_.AddExtensionAndReturnId("2")); | 105 list_.push_back(prefs_.AddExtensionAndReturnId("2")); |
| 106 list_.push_back(prefs_.AddExtensionAndReturnId("3")); | 106 list_.push_back(prefs_.AddExtensionAndReturnId("3")); |
| 107 ExtensionIdList before_list = prefs()->GetToolbarOrder(); | 107 ExtensionIdList before_list = prefs()->GetToolbarOrder(); |
| 108 EXPECT_TRUE(before_list.empty()); | 108 EXPECT_TRUE(before_list.empty()); |
| 109 prefs()->SetToolbarOrder(list_); | 109 prefs()->SetToolbarOrder(list_); |
| 110 } | 110 } |
| 111 | 111 |
| 112 virtual void Verify() OVERRIDE { | 112 virtual void Verify() override { |
| 113 ExtensionIdList result = prefs()->GetToolbarOrder(); | 113 ExtensionIdList result = prefs()->GetToolbarOrder(); |
| 114 ASSERT_EQ(list_, result); | 114 ASSERT_EQ(list_, result); |
| 115 } | 115 } |
| 116 | 116 |
| 117 private: | 117 private: |
| 118 ExtensionIdList list_; | 118 ExtensionIdList list_; |
| 119 }; | 119 }; |
| 120 TEST_F(ExtensionPrefsToolbarOrder, ToolbarOrder) {} | 120 TEST_F(ExtensionPrefsToolbarOrder, ToolbarOrder) {} |
| 121 | 121 |
| 122 // Tests the IsExtensionDisabled/SetExtensionState functions. | 122 // Tests the IsExtensionDisabled/SetExtensionState functions. |
| 123 class ExtensionPrefsExtensionState : public ExtensionPrefsTest { | 123 class ExtensionPrefsExtensionState : public ExtensionPrefsTest { |
| 124 public: | 124 public: |
| 125 virtual void Initialize() OVERRIDE { | 125 virtual void Initialize() override { |
| 126 extension = prefs_.AddExtension("test"); | 126 extension = prefs_.AddExtension("test"); |
| 127 prefs()->SetExtensionState(extension->id(), Extension::DISABLED); | 127 prefs()->SetExtensionState(extension->id(), Extension::DISABLED); |
| 128 } | 128 } |
| 129 | 129 |
| 130 virtual void Verify() OVERRIDE { | 130 virtual void Verify() override { |
| 131 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension->id())); | 131 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension->id())); |
| 132 } | 132 } |
| 133 | 133 |
| 134 private: | 134 private: |
| 135 scoped_refptr<Extension> extension; | 135 scoped_refptr<Extension> extension; |
| 136 }; | 136 }; |
| 137 TEST_F(ExtensionPrefsExtensionState, ExtensionState) {} | 137 TEST_F(ExtensionPrefsExtensionState, ExtensionState) {} |
| 138 | 138 |
| 139 class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest { | 139 class ExtensionPrefsEscalatePermissions : public ExtensionPrefsTest { |
| 140 public: | 140 public: |
| 141 virtual void Initialize() OVERRIDE { | 141 virtual void Initialize() override { |
| 142 extension = prefs_.AddExtension("test"); | 142 extension = prefs_.AddExtension("test"); |
| 143 prefs()->SetDidExtensionEscalatePermissions(extension.get(), true); | 143 prefs()->SetDidExtensionEscalatePermissions(extension.get(), true); |
| 144 } | 144 } |
| 145 | 145 |
| 146 virtual void Verify() OVERRIDE { | 146 virtual void Verify() override { |
| 147 EXPECT_TRUE(prefs()->DidExtensionEscalatePermissions(extension->id())); | 147 EXPECT_TRUE(prefs()->DidExtensionEscalatePermissions(extension->id())); |
| 148 } | 148 } |
| 149 | 149 |
| 150 private: | 150 private: |
| 151 scoped_refptr<Extension> extension; | 151 scoped_refptr<Extension> extension; |
| 152 }; | 152 }; |
| 153 TEST_F(ExtensionPrefsEscalatePermissions, EscalatePermissions) {} | 153 TEST_F(ExtensionPrefsEscalatePermissions, EscalatePermissions) {} |
| 154 | 154 |
| 155 // Tests the AddGrantedPermissions / GetGrantedPermissions functions. | 155 // Tests the AddGrantedPermissions / GetGrantedPermissions functions. |
| 156 class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest { | 156 class ExtensionPrefsGrantedPermissions : public ExtensionPrefsTest { |
| 157 public: | 157 public: |
| 158 virtual void Initialize() OVERRIDE { | 158 virtual void Initialize() override { |
| 159 const APIPermissionInfo* permission_info = | 159 const APIPermissionInfo* permission_info = |
| 160 PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket); | 160 PermissionsInfo::GetInstance()->GetByID(APIPermission::kSocket); |
| 161 | 161 |
| 162 extension_id_ = prefs_.AddExtensionAndReturnId("test"); | 162 extension_id_ = prefs_.AddExtensionAndReturnId("test"); |
| 163 | 163 |
| 164 api_perm_set1_.insert(APIPermission::kTab); | 164 api_perm_set1_.insert(APIPermission::kTab); |
| 165 api_perm_set1_.insert(APIPermission::kBookmark); | 165 api_perm_set1_.insert(APIPermission::kBookmark); |
| 166 scoped_ptr<APIPermission> permission( | 166 scoped_ptr<APIPermission> permission( |
| 167 permission_info->CreateAPIPermission()); | 167 permission_info->CreateAPIPermission()); |
| 168 { | 168 { |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 269 EXPECT_EQ(ehost_permissions_, | 269 EXPECT_EQ(ehost_permissions_, |
| 270 granted_permissions->explicit_hosts()); | 270 granted_permissions->explicit_hosts()); |
| 271 EXPECT_EQ(shost_permissions_, | 271 EXPECT_EQ(shost_permissions_, |
| 272 granted_permissions->scriptable_hosts()); | 272 granted_permissions->scriptable_hosts()); |
| 273 effective_permissions_.ClearPatterns(); | 273 effective_permissions_.ClearPatterns(); |
| 274 URLPatternSet::CreateUnion(ehost_permissions_, shost_permissions_, | 274 URLPatternSet::CreateUnion(ehost_permissions_, shost_permissions_, |
| 275 &effective_permissions_); | 275 &effective_permissions_); |
| 276 EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts()); | 276 EXPECT_EQ(effective_permissions_, granted_permissions->effective_hosts()); |
| 277 } | 277 } |
| 278 | 278 |
| 279 virtual void Verify() OVERRIDE { | 279 virtual void Verify() override { |
| 280 scoped_refptr<PermissionSet> permissions( | 280 scoped_refptr<PermissionSet> permissions( |
| 281 prefs()->GetGrantedPermissions(extension_id_)); | 281 prefs()->GetGrantedPermissions(extension_id_)); |
| 282 EXPECT_TRUE(permissions.get()); | 282 EXPECT_TRUE(permissions.get()); |
| 283 EXPECT_FALSE(permissions->HasEffectiveFullAccess()); | 283 EXPECT_FALSE(permissions->HasEffectiveFullAccess()); |
| 284 EXPECT_EQ(api_permissions_, permissions->apis()); | 284 EXPECT_EQ(api_permissions_, permissions->apis()); |
| 285 EXPECT_EQ(ehost_permissions_, | 285 EXPECT_EQ(ehost_permissions_, |
| 286 permissions->explicit_hosts()); | 286 permissions->explicit_hosts()); |
| 287 EXPECT_EQ(shost_permissions_, | 287 EXPECT_EQ(shost_permissions_, |
| 288 permissions->scriptable_hosts()); | 288 permissions->scriptable_hosts()); |
| 289 } | 289 } |
| (...skipping 10 matching lines...) Expand all Loading... |
| 300 APIPermissionSet api_permissions_; | 300 APIPermissionSet api_permissions_; |
| 301 URLPatternSet ehost_permissions_; | 301 URLPatternSet ehost_permissions_; |
| 302 URLPatternSet shost_permissions_; | 302 URLPatternSet shost_permissions_; |
| 303 URLPatternSet effective_permissions_; | 303 URLPatternSet effective_permissions_; |
| 304 }; | 304 }; |
| 305 TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {} | 305 TEST_F(ExtensionPrefsGrantedPermissions, GrantedPermissions) {} |
| 306 | 306 |
| 307 // Tests the SetActivePermissions / GetActivePermissions functions. | 307 // Tests the SetActivePermissions / GetActivePermissions functions. |
| 308 class ExtensionPrefsActivePermissions : public ExtensionPrefsTest { | 308 class ExtensionPrefsActivePermissions : public ExtensionPrefsTest { |
| 309 public: | 309 public: |
| 310 virtual void Initialize() OVERRIDE { | 310 virtual void Initialize() override { |
| 311 extension_id_ = prefs_.AddExtensionAndReturnId("test"); | 311 extension_id_ = prefs_.AddExtensionAndReturnId("test"); |
| 312 | 312 |
| 313 APIPermissionSet api_perms; | 313 APIPermissionSet api_perms; |
| 314 api_perms.insert(APIPermission::kTab); | 314 api_perms.insert(APIPermission::kTab); |
| 315 api_perms.insert(APIPermission::kBookmark); | 315 api_perms.insert(APIPermission::kBookmark); |
| 316 api_perms.insert(APIPermission::kHistory); | 316 api_perms.insert(APIPermission::kHistory); |
| 317 | 317 |
| 318 ManifestPermissionSet empty_manifest_permissions; | 318 ManifestPermissionSet empty_manifest_permissions; |
| 319 | 319 |
| 320 URLPatternSet ehosts; | 320 URLPatternSet ehosts; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 336 | 336 |
| 337 // Set the active permissions. | 337 // Set the active permissions. |
| 338 prefs()->SetActivePermissions(extension_id_, active_perms_.get()); | 338 prefs()->SetActivePermissions(extension_id_, active_perms_.get()); |
| 339 active = prefs()->GetActivePermissions(extension_id_); | 339 active = prefs()->GetActivePermissions(extension_id_); |
| 340 EXPECT_EQ(active_perms_->apis(), active->apis()); | 340 EXPECT_EQ(active_perms_->apis(), active->apis()); |
| 341 EXPECT_EQ(active_perms_->explicit_hosts(), active->explicit_hosts()); | 341 EXPECT_EQ(active_perms_->explicit_hosts(), active->explicit_hosts()); |
| 342 EXPECT_EQ(active_perms_->scriptable_hosts(), active->scriptable_hosts()); | 342 EXPECT_EQ(active_perms_->scriptable_hosts(), active->scriptable_hosts()); |
| 343 EXPECT_EQ(*active_perms_.get(), *active.get()); | 343 EXPECT_EQ(*active_perms_.get(), *active.get()); |
| 344 } | 344 } |
| 345 | 345 |
| 346 virtual void Verify() OVERRIDE { | 346 virtual void Verify() override { |
| 347 scoped_refptr<PermissionSet> permissions( | 347 scoped_refptr<PermissionSet> permissions( |
| 348 prefs()->GetActivePermissions(extension_id_)); | 348 prefs()->GetActivePermissions(extension_id_)); |
| 349 EXPECT_EQ(*active_perms_.get(), *permissions.get()); | 349 EXPECT_EQ(*active_perms_.get(), *permissions.get()); |
| 350 } | 350 } |
| 351 | 351 |
| 352 private: | 352 private: |
| 353 std::string extension_id_; | 353 std::string extension_id_; |
| 354 scoped_refptr<PermissionSet> active_perms_; | 354 scoped_refptr<PermissionSet> active_perms_; |
| 355 }; | 355 }; |
| 356 TEST_F(ExtensionPrefsActivePermissions, SetAndGetActivePermissions) {} | 356 TEST_F(ExtensionPrefsActivePermissions, SetAndGetActivePermissions) {} |
| 357 | 357 |
| 358 // Tests the GetVersionString function. | 358 // Tests the GetVersionString function. |
| 359 class ExtensionPrefsVersionString : public ExtensionPrefsTest { | 359 class ExtensionPrefsVersionString : public ExtensionPrefsTest { |
| 360 public: | 360 public: |
| 361 virtual void Initialize() OVERRIDE { | 361 virtual void Initialize() override { |
| 362 extension = prefs_.AddExtension("test"); | 362 extension = prefs_.AddExtension("test"); |
| 363 EXPECT_EQ("0.1", prefs()->GetVersionString(extension->id())); | 363 EXPECT_EQ("0.1", prefs()->GetVersionString(extension->id())); |
| 364 prefs()->OnExtensionUninstalled(extension->id(), | 364 prefs()->OnExtensionUninstalled(extension->id(), |
| 365 Manifest::INTERNAL, false); | 365 Manifest::INTERNAL, false); |
| 366 } | 366 } |
| 367 | 367 |
| 368 virtual void Verify() OVERRIDE { | 368 virtual void Verify() override { |
| 369 EXPECT_EQ("", prefs()->GetVersionString(extension->id())); | 369 EXPECT_EQ("", prefs()->GetVersionString(extension->id())); |
| 370 } | 370 } |
| 371 | 371 |
| 372 private: | 372 private: |
| 373 scoped_refptr<Extension> extension; | 373 scoped_refptr<Extension> extension; |
| 374 }; | 374 }; |
| 375 TEST_F(ExtensionPrefsVersionString, VersionString) {} | 375 TEST_F(ExtensionPrefsVersionString, VersionString) {} |
| 376 | 376 |
| 377 class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest { | 377 class ExtensionPrefsAcknowledgment : public ExtensionPrefsTest { |
| 378 public: | 378 public: |
| 379 virtual void Initialize() OVERRIDE { | 379 virtual void Initialize() override { |
| 380 not_installed_id_ = "pghjnghklobnfoidcldiidjjjhkeeaoi"; | 380 not_installed_id_ = "pghjnghklobnfoidcldiidjjjhkeeaoi"; |
| 381 | 381 |
| 382 // Install some extensions. | 382 // Install some extensions. |
| 383 for (int i = 0; i < 5; i++) { | 383 for (int i = 0; i < 5; i++) { |
| 384 std::string name = "test" + base::IntToString(i); | 384 std::string name = "test" + base::IntToString(i); |
| 385 extensions_.push_back(prefs_.AddExtension(name)); | 385 extensions_.push_back(prefs_.AddExtension(name)); |
| 386 } | 386 } |
| 387 EXPECT_EQ(NULL, | 387 EXPECT_EQ(NULL, |
| 388 prefs()->GetInstalledExtensionInfo(not_installed_id_).get()); | 388 prefs()->GetInstalledExtensionInfo(not_installed_id_).get()); |
| 389 | 389 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 402 } | 402 } |
| 403 } | 403 } |
| 404 // For each type of acknowledgment, acknowledge one installed and one | 404 // For each type of acknowledgment, acknowledge one installed and one |
| 405 // not-installed extension id. | 405 // not-installed extension id. |
| 406 prefs()->AcknowledgeExternalExtension(external_id_); | 406 prefs()->AcknowledgeExternalExtension(external_id_); |
| 407 prefs()->AcknowledgeBlacklistedExtension(blacklisted_id_); | 407 prefs()->AcknowledgeBlacklistedExtension(blacklisted_id_); |
| 408 prefs()->AcknowledgeExternalExtension(not_installed_id_); | 408 prefs()->AcknowledgeExternalExtension(not_installed_id_); |
| 409 prefs()->AcknowledgeBlacklistedExtension(not_installed_id_); | 409 prefs()->AcknowledgeBlacklistedExtension(not_installed_id_); |
| 410 } | 410 } |
| 411 | 411 |
| 412 virtual void Verify() OVERRIDE { | 412 virtual void Verify() override { |
| 413 ExtensionList::const_iterator iter; | 413 ExtensionList::const_iterator iter; |
| 414 for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { | 414 for (iter = extensions_.begin(); iter != extensions_.end(); ++iter) { |
| 415 std::string id = (*iter)->id(); | 415 std::string id = (*iter)->id(); |
| 416 if (id == external_id_) { | 416 if (id == external_id_) { |
| 417 EXPECT_TRUE(prefs()->IsExternalExtensionAcknowledged(id)); | 417 EXPECT_TRUE(prefs()->IsExternalExtensionAcknowledged(id)); |
| 418 } else { | 418 } else { |
| 419 EXPECT_FALSE(prefs()->IsExternalExtensionAcknowledged(id)); | 419 EXPECT_FALSE(prefs()->IsExternalExtensionAcknowledged(id)); |
| 420 } | 420 } |
| 421 if (id == blacklisted_id_) { | 421 if (id == blacklisted_id_) { |
| 422 EXPECT_TRUE(prefs()->IsBlacklistedExtensionAcknowledged(id)); | 422 EXPECT_TRUE(prefs()->IsBlacklistedExtensionAcknowledged(id)); |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 474 | 474 |
| 475 bool HasInfoForId(ExtensionPrefs::ExtensionsInfo* info, | 475 bool HasInfoForId(ExtensionPrefs::ExtensionsInfo* info, |
| 476 const std::string& id) { | 476 const std::string& id) { |
| 477 for (size_t i = 0; i < info->size(); ++i) { | 477 for (size_t i = 0; i < info->size(); ++i) { |
| 478 if (info->at(i)->extension_id == id) | 478 if (info->at(i)->extension_id == id) |
| 479 return true; | 479 return true; |
| 480 } | 480 } |
| 481 return false; | 481 return false; |
| 482 } | 482 } |
| 483 | 483 |
| 484 virtual void Initialize() OVERRIDE { | 484 virtual void Initialize() override { |
| 485 PathService::Get(chrome::DIR_TEST_DATA, &basedir_); | 485 PathService::Get(chrome::DIR_TEST_DATA, &basedir_); |
| 486 now_ = Time::Now(); | 486 now_ = Time::Now(); |
| 487 id1_ = prefs_.AddExtensionAndReturnId("1"); | 487 id1_ = prefs_.AddExtensionAndReturnId("1"); |
| 488 id2_ = prefs_.AddExtensionAndReturnId("2"); | 488 id2_ = prefs_.AddExtensionAndReturnId("2"); |
| 489 id3_ = prefs_.AddExtensionAndReturnId("3"); | 489 id3_ = prefs_.AddExtensionAndReturnId("3"); |
| 490 id4_ = prefs_.AddExtensionAndReturnId("4"); | 490 id4_ = prefs_.AddExtensionAndReturnId("4"); |
| 491 | 491 |
| 492 // Set info for two extensions, then remove it. | 492 // Set info for two extensions, then remove it. |
| 493 SetIdleInfo(id1_, 1); | 493 SetIdleInfo(id1_, 1); |
| 494 SetIdleInfo(id2_, 2); | 494 SetIdleInfo(id2_, 2); |
| (...skipping 22 matching lines...) Expand all Loading... |
| 517 SetIdleInfo(id2_, 2); | 517 SetIdleInfo(id2_, 2); |
| 518 SetIdleInfo(id3_, 3); | 518 SetIdleInfo(id3_, 3); |
| 519 SetIdleInfo(id4_, 4); | 519 SetIdleInfo(id4_, 4); |
| 520 VerifyIdleInfo(id1_, 1); | 520 VerifyIdleInfo(id1_, 1); |
| 521 VerifyIdleInfo(id2_, 2); | 521 VerifyIdleInfo(id2_, 2); |
| 522 VerifyIdleInfo(id3_, 3); | 522 VerifyIdleInfo(id3_, 3); |
| 523 VerifyIdleInfo(id4_, 4); | 523 VerifyIdleInfo(id4_, 4); |
| 524 prefs()->RemoveDelayedInstallInfo(id3_); | 524 prefs()->RemoveDelayedInstallInfo(id3_); |
| 525 } | 525 } |
| 526 | 526 |
| 527 virtual void Verify() OVERRIDE { | 527 virtual void Verify() override { |
| 528 // Make sure the info for the 3 extensions we expect is present. | 528 // Make sure the info for the 3 extensions we expect is present. |
| 529 scoped_ptr<ExtensionPrefs::ExtensionsInfo> info( | 529 scoped_ptr<ExtensionPrefs::ExtensionsInfo> info( |
| 530 prefs()->GetAllDelayedInstallInfo()); | 530 prefs()->GetAllDelayedInstallInfo()); |
| 531 EXPECT_EQ(3u, info->size()); | 531 EXPECT_EQ(3u, info->size()); |
| 532 EXPECT_TRUE(HasInfoForId(info.get(), id1_)); | 532 EXPECT_TRUE(HasInfoForId(info.get(), id1_)); |
| 533 EXPECT_TRUE(HasInfoForId(info.get(), id2_)); | 533 EXPECT_TRUE(HasInfoForId(info.get(), id2_)); |
| 534 EXPECT_TRUE(HasInfoForId(info.get(), id4_)); | 534 EXPECT_TRUE(HasInfoForId(info.get(), id4_)); |
| 535 VerifyIdleInfo(id1_, 1); | 535 VerifyIdleInfo(id1_, 1); |
| 536 VerifyIdleInfo(id2_, 2); | 536 VerifyIdleInfo(id2_, 2); |
| 537 VerifyIdleInfo(id4_, 4); | 537 VerifyIdleInfo(id4_, 4); |
| 538 | 538 |
| 539 // Make sure there isn't info the for the one extension id we removed. | 539 // Make sure there isn't info the for the one extension id we removed. |
| 540 EXPECT_FALSE(prefs()->GetDelayedInstallInfo(id3_)); | 540 EXPECT_FALSE(prefs()->GetDelayedInstallInfo(id3_)); |
| 541 } | 541 } |
| 542 | 542 |
| 543 protected: | 543 protected: |
| 544 Time now_; | 544 Time now_; |
| 545 base::FilePath basedir_; | 545 base::FilePath basedir_; |
| 546 std::string id1_; | 546 std::string id1_; |
| 547 std::string id2_; | 547 std::string id2_; |
| 548 std::string id3_; | 548 std::string id3_; |
| 549 std::string id4_; | 549 std::string id4_; |
| 550 }; | 550 }; |
| 551 TEST_F(ExtensionPrefsDelayedInstallInfo, DelayedInstallInfo) {} | 551 TEST_F(ExtensionPrefsDelayedInstallInfo, DelayedInstallInfo) {} |
| 552 | 552 |
| 553 // Tests the FinishDelayedInstallInfo function. | 553 // Tests the FinishDelayedInstallInfo function. |
| 554 class ExtensionPrefsFinishDelayedInstallInfo : public ExtensionPrefsTest { | 554 class ExtensionPrefsFinishDelayedInstallInfo : public ExtensionPrefsTest { |
| 555 public: | 555 public: |
| 556 virtual void Initialize() OVERRIDE { | 556 virtual void Initialize() override { |
| 557 base::DictionaryValue dictionary; | 557 base::DictionaryValue dictionary; |
| 558 dictionary.SetString(manifest_keys::kName, "test"); | 558 dictionary.SetString(manifest_keys::kName, "test"); |
| 559 dictionary.SetString(manifest_keys::kVersion, "0.1"); | 559 dictionary.SetString(manifest_keys::kVersion, "0.1"); |
| 560 dictionary.SetString(manifest_keys::kBackgroundPage, "background.html"); | 560 dictionary.SetString(manifest_keys::kBackgroundPage, "background.html"); |
| 561 scoped_refptr<Extension> extension = | 561 scoped_refptr<Extension> extension = |
| 562 prefs_.AddExtensionWithManifest(dictionary, Manifest::INTERNAL); | 562 prefs_.AddExtensionWithManifest(dictionary, Manifest::INTERNAL); |
| 563 id_ = extension->id(); | 563 id_ = extension->id(); |
| 564 | 564 |
| 565 | 565 |
| 566 // Set idle info | 566 // Set idle info |
| (...skipping 14 matching lines...) Expand all Loading... |
| 581 Extension::ENABLED, | 581 Extension::ENABLED, |
| 582 kInstallFlagNone, | 582 kInstallFlagNone, |
| 583 ExtensionPrefs::DELAY_REASON_WAIT_FOR_IDLE, | 583 ExtensionPrefs::DELAY_REASON_WAIT_FOR_IDLE, |
| 584 syncer::StringOrdinal(), | 584 syncer::StringOrdinal(), |
| 585 "Param"); | 585 "Param"); |
| 586 | 586 |
| 587 // Finish idle installation | 587 // Finish idle installation |
| 588 ASSERT_TRUE(prefs()->FinishDelayedInstallInfo(id_)); | 588 ASSERT_TRUE(prefs()->FinishDelayedInstallInfo(id_)); |
| 589 } | 589 } |
| 590 | 590 |
| 591 virtual void Verify() OVERRIDE { | 591 virtual void Verify() override { |
| 592 EXPECT_FALSE(prefs()->GetDelayedInstallInfo(id_)); | 592 EXPECT_FALSE(prefs()->GetDelayedInstallInfo(id_)); |
| 593 EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(id_)); | 593 EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(id_)); |
| 594 | 594 |
| 595 const base::DictionaryValue* manifest; | 595 const base::DictionaryValue* manifest; |
| 596 ASSERT_TRUE(prefs()->ReadPrefAsDictionary(id_, "manifest", &manifest)); | 596 ASSERT_TRUE(prefs()->ReadPrefAsDictionary(id_, "manifest", &manifest)); |
| 597 ASSERT_TRUE(manifest); | 597 ASSERT_TRUE(manifest); |
| 598 std::string value; | 598 std::string value; |
| 599 EXPECT_TRUE(manifest->GetString(manifest_keys::kName, &value)); | 599 EXPECT_TRUE(manifest->GetString(manifest_keys::kName, &value)); |
| 600 EXPECT_EQ("test", value); | 600 EXPECT_EQ("test", value); |
| 601 EXPECT_TRUE(manifest->GetString(manifest_keys::kVersion, &value)); | 601 EXPECT_TRUE(manifest->GetString(manifest_keys::kVersion, &value)); |
| 602 EXPECT_EQ("0.2", value); | 602 EXPECT_EQ("0.2", value); |
| 603 EXPECT_FALSE(manifest->GetString(manifest_keys::kBackgroundPage, &value)); | 603 EXPECT_FALSE(manifest->GetString(manifest_keys::kBackgroundPage, &value)); |
| 604 const base::ListValue* scripts; | 604 const base::ListValue* scripts; |
| 605 ASSERT_TRUE(manifest->GetList(manifest_keys::kBackgroundScripts, &scripts)); | 605 ASSERT_TRUE(manifest->GetList(manifest_keys::kBackgroundScripts, &scripts)); |
| 606 EXPECT_EQ(1u, scripts->GetSize()); | 606 EXPECT_EQ(1u, scripts->GetSize()); |
| 607 } | 607 } |
| 608 | 608 |
| 609 protected: | 609 protected: |
| 610 std::string id_; | 610 std::string id_; |
| 611 }; | 611 }; |
| 612 TEST_F(ExtensionPrefsFinishDelayedInstallInfo, FinishDelayedInstallInfo) {} | 612 TEST_F(ExtensionPrefsFinishDelayedInstallInfo, FinishDelayedInstallInfo) {} |
| 613 | 613 |
| 614 class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest { | 614 class ExtensionPrefsOnExtensionInstalled : public ExtensionPrefsTest { |
| 615 public: | 615 public: |
| 616 virtual void Initialize() OVERRIDE { | 616 virtual void Initialize() override { |
| 617 extension_ = prefs_.AddExtension("on_extension_installed"); | 617 extension_ = prefs_.AddExtension("on_extension_installed"); |
| 618 EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id())); | 618 EXPECT_FALSE(prefs()->IsExtensionDisabled(extension_->id())); |
| 619 prefs()->OnExtensionInstalled(extension_.get(), | 619 prefs()->OnExtensionInstalled(extension_.get(), |
| 620 Extension::DISABLED, | 620 Extension::DISABLED, |
| 621 syncer::StringOrdinal(), | 621 syncer::StringOrdinal(), |
| 622 "Param"); | 622 "Param"); |
| 623 } | 623 } |
| 624 | 624 |
| 625 virtual void Verify() OVERRIDE { | 625 virtual void Verify() override { |
| 626 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id())); | 626 EXPECT_TRUE(prefs()->IsExtensionDisabled(extension_->id())); |
| 627 EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(extension_->id())); | 627 EXPECT_EQ(std::string("Param"), prefs()->GetInstallParam(extension_->id())); |
| 628 } | 628 } |
| 629 | 629 |
| 630 private: | 630 private: |
| 631 scoped_refptr<Extension> extension_; | 631 scoped_refptr<Extension> extension_; |
| 632 }; | 632 }; |
| 633 TEST_F(ExtensionPrefsOnExtensionInstalled, | 633 TEST_F(ExtensionPrefsOnExtensionInstalled, |
| 634 ExtensionPrefsOnExtensionInstalled) {} | 634 ExtensionPrefsOnExtensionInstalled) {} |
| 635 | 635 |
| 636 class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest { | 636 class ExtensionPrefsAppDraggedByUser : public ExtensionPrefsTest { |
| 637 public: | 637 public: |
| 638 virtual void Initialize() OVERRIDE { | 638 virtual void Initialize() override { |
| 639 extension_ = prefs_.AddExtension("on_extension_installed"); | 639 extension_ = prefs_.AddExtension("on_extension_installed"); |
| 640 EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id())); | 640 EXPECT_FALSE(prefs()->WasAppDraggedByUser(extension_->id())); |
| 641 prefs()->OnExtensionInstalled(extension_.get(), | 641 prefs()->OnExtensionInstalled(extension_.get(), |
| 642 Extension::ENABLED, | 642 Extension::ENABLED, |
| 643 syncer::StringOrdinal(), | 643 syncer::StringOrdinal(), |
| 644 std::string()); | 644 std::string()); |
| 645 } | 645 } |
| 646 | 646 |
| 647 virtual void Verify() OVERRIDE { | 647 virtual void Verify() override { |
| 648 // Set the flag and see if it persisted. | 648 // Set the flag and see if it persisted. |
| 649 prefs()->SetAppDraggedByUser(extension_->id()); | 649 prefs()->SetAppDraggedByUser(extension_->id()); |
| 650 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); | 650 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); |
| 651 | 651 |
| 652 // Make sure it doesn't change on consecutive calls. | 652 // Make sure it doesn't change on consecutive calls. |
| 653 prefs()->SetAppDraggedByUser(extension_->id()); | 653 prefs()->SetAppDraggedByUser(extension_->id()); |
| 654 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); | 654 EXPECT_TRUE(prefs()->WasAppDraggedByUser(extension_->id())); |
| 655 } | 655 } |
| 656 | 656 |
| 657 private: | 657 private: |
| 658 scoped_refptr<Extension> extension_; | 658 scoped_refptr<Extension> extension_; |
| 659 }; | 659 }; |
| 660 TEST_F(ExtensionPrefsAppDraggedByUser, ExtensionPrefsAppDraggedByUser) {} | 660 TEST_F(ExtensionPrefsAppDraggedByUser, ExtensionPrefsAppDraggedByUser) {} |
| 661 | 661 |
| 662 class ExtensionPrefsFlags : public ExtensionPrefsTest { | 662 class ExtensionPrefsFlags : public ExtensionPrefsTest { |
| 663 public: | 663 public: |
| 664 virtual void Initialize() OVERRIDE { | 664 virtual void Initialize() override { |
| 665 { | 665 { |
| 666 base::DictionaryValue dictionary; | 666 base::DictionaryValue dictionary; |
| 667 dictionary.SetString(manifest_keys::kName, "from_webstore"); | 667 dictionary.SetString(manifest_keys::kName, "from_webstore"); |
| 668 dictionary.SetString(manifest_keys::kVersion, "0.1"); | 668 dictionary.SetString(manifest_keys::kVersion, "0.1"); |
| 669 webstore_extension_ = prefs_.AddExtensionWithManifestAndFlags( | 669 webstore_extension_ = prefs_.AddExtensionWithManifestAndFlags( |
| 670 dictionary, Manifest::INTERNAL, Extension::FROM_WEBSTORE); | 670 dictionary, Manifest::INTERNAL, Extension::FROM_WEBSTORE); |
| 671 } | 671 } |
| 672 | 672 |
| 673 { | 673 { |
| 674 base::DictionaryValue dictionary; | 674 base::DictionaryValue dictionary; |
| (...skipping 15 matching lines...) Expand all Loading... |
| 690 | 690 |
| 691 { | 691 { |
| 692 base::DictionaryValue dictionary; | 692 base::DictionaryValue dictionary; |
| 693 dictionary.SetString(manifest_keys::kName, "was_installed_by_oem"); | 693 dictionary.SetString(manifest_keys::kName, "was_installed_by_oem"); |
| 694 dictionary.SetString(manifest_keys::kVersion, "0.1"); | 694 dictionary.SetString(manifest_keys::kVersion, "0.1"); |
| 695 oem_extension_ = prefs_.AddExtensionWithManifestAndFlags( | 695 oem_extension_ = prefs_.AddExtensionWithManifestAndFlags( |
| 696 dictionary, Manifest::INTERNAL, Extension::WAS_INSTALLED_BY_OEM); | 696 dictionary, Manifest::INTERNAL, Extension::WAS_INSTALLED_BY_OEM); |
| 697 } | 697 } |
| 698 } | 698 } |
| 699 | 699 |
| 700 virtual void Verify() OVERRIDE { | 700 virtual void Verify() override { |
| 701 EXPECT_TRUE(prefs()->IsFromWebStore(webstore_extension_->id())); | 701 EXPECT_TRUE(prefs()->IsFromWebStore(webstore_extension_->id())); |
| 702 EXPECT_FALSE(prefs()->IsFromBookmark(webstore_extension_->id())); | 702 EXPECT_FALSE(prefs()->IsFromBookmark(webstore_extension_->id())); |
| 703 | 703 |
| 704 EXPECT_TRUE(prefs()->IsFromBookmark(bookmark_extension_->id())); | 704 EXPECT_TRUE(prefs()->IsFromBookmark(bookmark_extension_->id())); |
| 705 EXPECT_FALSE(prefs()->IsFromWebStore(bookmark_extension_->id())); | 705 EXPECT_FALSE(prefs()->IsFromWebStore(bookmark_extension_->id())); |
| 706 | 706 |
| 707 EXPECT_TRUE(prefs()->WasInstalledByDefault(default_extension_->id())); | 707 EXPECT_TRUE(prefs()->WasInstalledByDefault(default_extension_->id())); |
| 708 EXPECT_TRUE(prefs()->WasInstalledByOem(oem_extension_->id())); | 708 EXPECT_TRUE(prefs()->WasInstalledByOem(oem_extension_->id())); |
| 709 } | 709 } |
| 710 | 710 |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 754 } | 754 } |
| 755 | 755 |
| 756 PrefsPrepopulatedTestBase::~PrefsPrepopulatedTestBase() { | 756 PrefsPrepopulatedTestBase::~PrefsPrepopulatedTestBase() { |
| 757 } | 757 } |
| 758 | 758 |
| 759 // Tests that blacklist state can be queried. | 759 // Tests that blacklist state can be queried. |
| 760 class ExtensionPrefsBlacklistedExtensions : public ExtensionPrefsTest { | 760 class ExtensionPrefsBlacklistedExtensions : public ExtensionPrefsTest { |
| 761 public: | 761 public: |
| 762 virtual ~ExtensionPrefsBlacklistedExtensions() {} | 762 virtual ~ExtensionPrefsBlacklistedExtensions() {} |
| 763 | 763 |
| 764 virtual void Initialize() OVERRIDE { | 764 virtual void Initialize() override { |
| 765 extension_a_ = prefs_.AddExtension("a"); | 765 extension_a_ = prefs_.AddExtension("a"); |
| 766 extension_b_ = prefs_.AddExtension("b"); | 766 extension_b_ = prefs_.AddExtension("b"); |
| 767 extension_c_ = prefs_.AddExtension("c"); | 767 extension_c_ = prefs_.AddExtension("c"); |
| 768 } | 768 } |
| 769 | 769 |
| 770 virtual void Verify() OVERRIDE { | 770 virtual void Verify() override { |
| 771 { | 771 { |
| 772 ExtensionIdSet ids; | 772 ExtensionIdSet ids; |
| 773 EXPECT_EQ(ids, prefs()->GetBlacklistedExtensions()); | 773 EXPECT_EQ(ids, prefs()->GetBlacklistedExtensions()); |
| 774 } | 774 } |
| 775 prefs()->SetExtensionBlacklisted(extension_a_->id(), true); | 775 prefs()->SetExtensionBlacklisted(extension_a_->id(), true); |
| 776 { | 776 { |
| 777 ExtensionIdSet ids; | 777 ExtensionIdSet ids; |
| 778 ids.insert(extension_a_->id()); | 778 ids.insert(extension_a_->id()); |
| 779 EXPECT_EQ(ids, prefs()->GetBlacklistedExtensions()); | 779 EXPECT_EQ(ids, prefs()->GetBlacklistedExtensions()); |
| 780 } | 780 } |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 834 }; | 834 }; |
| 835 TEST_F(ExtensionPrefsBlacklistedExtensions, | 835 TEST_F(ExtensionPrefsBlacklistedExtensions, |
| 836 ExtensionPrefsBlacklistedExtensions) {} | 836 ExtensionPrefsBlacklistedExtensions) {} |
| 837 | 837 |
| 838 // Tests the blacklist state. Old "blacklist" preference should take precedence | 838 // Tests the blacklist state. Old "blacklist" preference should take precedence |
| 839 // over new "blacklist_state". | 839 // over new "blacklist_state". |
| 840 class ExtensionPrefsBlacklistState : public ExtensionPrefsTest { | 840 class ExtensionPrefsBlacklistState : public ExtensionPrefsTest { |
| 841 public: | 841 public: |
| 842 virtual ~ExtensionPrefsBlacklistState() {} | 842 virtual ~ExtensionPrefsBlacklistState() {} |
| 843 | 843 |
| 844 virtual void Initialize() OVERRIDE { | 844 virtual void Initialize() override { |
| 845 extension_a_ = prefs_.AddExtension("a"); | 845 extension_a_ = prefs_.AddExtension("a"); |
| 846 } | 846 } |
| 847 | 847 |
| 848 virtual void Verify() OVERRIDE { | 848 virtual void Verify() override { |
| 849 ExtensionIdSet empty_ids; | 849 ExtensionIdSet empty_ids; |
| 850 EXPECT_EQ(empty_ids, prefs()->GetBlacklistedExtensions()); | 850 EXPECT_EQ(empty_ids, prefs()->GetBlacklistedExtensions()); |
| 851 | 851 |
| 852 prefs()->SetExtensionBlacklisted(extension_a_->id(), true); | 852 prefs()->SetExtensionBlacklisted(extension_a_->id(), true); |
| 853 EXPECT_EQ(BLACKLISTED_MALWARE, | 853 EXPECT_EQ(BLACKLISTED_MALWARE, |
| 854 prefs()->GetExtensionBlacklistState(extension_a_->id())); | 854 prefs()->GetExtensionBlacklistState(extension_a_->id())); |
| 855 | 855 |
| 856 prefs()->SetExtensionBlacklistState(extension_a_->id(), | 856 prefs()->SetExtensionBlacklistState(extension_a_->id(), |
| 857 BLACKLISTED_POTENTIALLY_UNWANTED); | 857 BLACKLISTED_POTENTIALLY_UNWANTED); |
| 858 EXPECT_EQ(BLACKLISTED_POTENTIALLY_UNWANTED, | 858 EXPECT_EQ(BLACKLISTED_POTENTIALLY_UNWANTED, |
| (...skipping 14 matching lines...) Expand all Loading... |
| 873 EXPECT_FALSE(prefs()->IsExtensionBlacklisted(extension_a_->id())); | 873 EXPECT_FALSE(prefs()->IsExtensionBlacklisted(extension_a_->id())); |
| 874 EXPECT_EQ(empty_ids, prefs()->GetBlacklistedExtensions()); | 874 EXPECT_EQ(empty_ids, prefs()->GetBlacklistedExtensions()); |
| 875 } | 875 } |
| 876 | 876 |
| 877 private: | 877 private: |
| 878 scoped_refptr<const Extension> extension_a_; | 878 scoped_refptr<const Extension> extension_a_; |
| 879 }; | 879 }; |
| 880 TEST_F(ExtensionPrefsBlacklistState, ExtensionPrefsBlacklistState) {} | 880 TEST_F(ExtensionPrefsBlacklistState, ExtensionPrefsBlacklistState) {} |
| 881 | 881 |
| 882 } // namespace extensions | 882 } // namespace extensions |
| OLD | NEW |