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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/updater/extension_updater_unittest.cc

Issue 23591050: Delete the omahaproxy-backed extension blacklist and clear its entries from the (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix memory leak in blacklist test Created 7 years, 3 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/extensions/updater/extension_updater.cc ('k') | chrome/browser/safe_browsing/database_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/updater/extension_updater_unittest.cc
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 7fc96f4a7d6e2727a41832b6e72c1fc882fe95fd..cc5d412ae535bc4f26494854ffe2f124af77573b 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -24,12 +24,10 @@
#include "base/threading/thread.h"
#include "base/version.h"
#include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/extensions/blacklist.h"
#include "chrome/browser/extensions/crx_installer.h"
#include "chrome/browser/extensions/extension_error_reporter.h"
#include "chrome/browser/extensions/extension_sync_data.h"
#include "chrome/browser/extensions/extension_system.h"
-#include "chrome/browser/extensions/test_blacklist.h"
#include "chrome/browser/extensions/test_extension_prefs.h"
#include "chrome/browser/extensions/test_extension_service.h"
#include "chrome/browser/extensions/test_extension_system.h"
@@ -134,11 +132,6 @@ class MockExtensionDownloaderDelegate : public ExtensionDownloaderDelegate {
const std::string&,
const PingResult&,
const std::set<int>&));
- MOCK_METHOD5(OnBlacklistDownloadFinished, void(const std::string&,
- const std::string&,
- const std::string&,
- const PingResult&,
- const std::set<int>&));
MOCK_METHOD2(GetPingDataForExtension,
bool(const std::string&, ManifestFetchData::PingData*));
MOCK_METHOD1(GetUpdateUrlData, std::string(const std::string&));
@@ -236,9 +229,7 @@ class NotificationsObserver : public content::NotificationObserver {
class MockService : public TestExtensionService {
public:
explicit MockService(TestExtensionPrefs* prefs)
- : prefs_(prefs),
- pending_extension_manager_(*this),
- blacklist_(prefs_->prefs()) {
+ : prefs_(prefs), pending_extension_manager_(*this) {
}
virtual ~MockService() {}
@@ -259,8 +250,6 @@ class MockService : public TestExtensionService {
PrefService* pref_service() { return prefs_->pref_service(); }
- Blacklist* blacklist() { return &blacklist_; }
-
// Creates test extensions and inserts them into list. The name and
// version are all based on their index. If |update_url| is non-null, it
// will be used as the update_url for each extension.
@@ -288,7 +277,6 @@ class MockService : public TestExtensionService {
TestExtensionPrefs* const prefs_;
PendingExtensionManager pending_extension_manager_;
TestingProfile profile_;
- Blacklist blacklist_;
private:
DISALLOW_COPY_AND_ASSIGN(MockService);
@@ -575,13 +563,8 @@ class ExtensionUpdaterTest : public testing::Test {
net::TestURLFetcherFactory factory;
ExtensionUpdater updater(
&service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), 60*60*24);
+ service.profile(), 60*60*24);
updater.Start();
- // Disable blacklist checks (tested elsewhere) so that we only see the
- // update HTTP request.
- ExtensionUpdater::CheckParams check_params;
- check_params.check_blacklist = false;
- updater.set_default_check_params(check_params);
// Tell the update that it's time to do update checks.
EXPECT_EQ(0u, observer.StartedCount());
@@ -613,45 +596,6 @@ class ExtensionUpdaterTest : public testing::Test {
EXPECT_EQ("", params["uc"]);
}
- void TestBlacklistUpdateCheckRequests() {
- // Setup and start the updater.
- ServiceForManifestTests service(prefs_.get());
- NotificationsObserver observer;
-
- net::TestURLFetcherFactory factory;
- ExtensionUpdater updater(
- &service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), 60*60*24);
- updater.Start();
-
- // Tell the updater that it's time to do update checks.
- EXPECT_EQ(0u, observer.StartedCount());
- SimulateTimerFired(&updater);
- EXPECT_EQ(1u, observer.StartedCount());
-
- // Get the url our mock fetcher was asked to fetch.
- net::TestURLFetcher* fetcher =
- factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
- ASSERT_FALSE(fetcher == NULL);
- const GURL& url = fetcher->GetOriginalURL();
-
- EXPECT_FALSE(url.is_empty());
- EXPECT_TRUE(url.is_valid());
- EXPECT_TRUE(url.SchemeIs("https"));
- EXPECT_EQ("clients2.google.com", url.host());
- EXPECT_EQ("/service/update2/crx", url.path());
-
- // Validate the extension request parameters in the query. It should
- // look something like "x=id%3D<id>%26v%3D<version>%26uc".
- EXPECT_TRUE(url.has_query());
- std::map<std::string, std::string> params;
- VerifyQueryAndExtractParameters(url.query(), &params);
- EXPECT_EQ("com.google.crx.blacklist", params["id"]);
- EXPECT_EQ("0", params["v"]);
- EXPECT_EQ("", params["uc"]);
- EXPECT_TRUE(ContainsKey(params, "ping"));
- }
-
void TestUpdateUrlDataEmpty() {
const std::string id = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
const std::string version = "1.0";
@@ -1028,7 +972,6 @@ class ExtensionUpdaterTest : public testing::Test {
ExtensionUpdater updater(service.get(), service->extension_prefs(),
service->pref_service(),
service->profile(),
- service->blacklist(),
kUpdateFrequencySecs);
updater.Start();
ResetDownloader(
@@ -1098,58 +1041,6 @@ class ExtensionUpdaterTest : public testing::Test {
EXPECT_EQ(extension_file_path, tmpfile_path);
}
- void TestBlacklistDownloading() {
- net::TestURLFetcherFactory factory;
- net::TestURLFetcher* fetcher = NULL;
- MockService service(prefs_.get());
- TestBlacklist blacklist(service.blacklist());
- ExtensionUpdater updater(
- &service, service.extension_prefs(), service.pref_service(),
- service.profile(), blacklist.blacklist(), kUpdateFrequencySecs);
- updater.Start();
- ResetDownloader(
- &updater,
- new ExtensionDownloader(&updater, service.request_context()));
- updater.downloader_->extensions_queue_.set_backoff_policy(
- &kNoBackoffPolicy);
-
- GURL test_url("http://localhost/extension.crx");
-
- std::string id = "com.google.crx.blacklist";
-
- std::string hash =
- "CCEA231D3CD30A348DA1383ED311EAC11E82360773CB2BA4E2C3A5FF16E337CC";
-
- std::string version = "0.0.1";
- std::set<int> requests;
- requests.insert(0);
- scoped_ptr<ExtensionDownloader::ExtensionFetch> fetch(
- new ExtensionDownloader::ExtensionFetch(
- id, test_url, hash, version, requests));
- updater.downloader_->FetchUpdatedExtension(fetch.Pass());
-
- // Call back the ExtensionUpdater with a 200 response and some test data.
- std::string extension_data("aaaabbbbcccceeeeaaaabbbbcccceeee");
- EXPECT_FALSE(blacklist.IsBlacklisted(extension_data));
-
- fetcher = factory.GetFetcherByID(ExtensionDownloader::kExtensionFetcherId);
- EXPECT_TRUE(fetcher != NULL && fetcher->delegate() != NULL);
- EXPECT_TRUE(fetcher->GetLoadFlags() == kExpectedLoadFlags);
-
- fetcher->set_url(test_url);
- fetcher->set_status(net::URLRequestStatus());
- fetcher->set_response_code(200);
- fetcher->SetResponseString(extension_data);
- fetcher->delegate()->OnURLFetchComplete(fetcher);
-
- RunUntilIdle();
-
- EXPECT_TRUE(blacklist.IsBlacklisted(extension_data));
-
- EXPECT_EQ(version, service.pref_service()->
- GetString(prefs::kExtensionBlacklistUpdateVersion));
- }
-
// Two extensions are updated. If |updates_start_running| is true, the
// mock extensions service has UpdateExtension(...) return true, and
// the test is responsible for creating fake CrxInstallers. Otherwise,
@@ -1160,7 +1051,7 @@ class ExtensionUpdaterTest : public testing::Test {
ServiceForDownloadTests service(prefs_.get());
ExtensionUpdater updater(
&service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), kUpdateFrequencySecs);
+ service.profile(), kUpdateFrequencySecs);
updater.Start();
ResetDownloader(
&updater,
@@ -1374,9 +1265,8 @@ class ExtensionUpdaterTest : public testing::Test {
ExtensionUpdater updater(
&service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), kUpdateFrequencySecs);
+ service.profile(), kUpdateFrequencySecs);
ExtensionUpdater::CheckParams params;
- params.check_blacklist = false;
updater.Start();
updater.CheckNow(params);
@@ -1468,7 +1358,7 @@ class ExtensionUpdaterTest : public testing::Test {
ExtensionUpdater updater(
&service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), kUpdateFrequencySecs);
+ service.profile(), kUpdateFrequencySecs);
updater.Start();
ResetDownloader(
&updater,
@@ -1517,10 +1407,6 @@ TEST_F(ExtensionUpdaterTest, TestExtensionUpdateCheckRequestsPending) {
TestExtensionUpdateCheckRequests(true);
}
-TEST_F(ExtensionUpdaterTest, TestBlacklistUpdateCheckRequests) {
- TestBlacklistUpdateCheckRequests();
-}
-
TEST_F(ExtensionUpdaterTest, TestUpdateUrlData) {
TestUpdateUrlDataEmpty();
TestUpdateUrlDataSimple();
@@ -1561,10 +1447,6 @@ TEST_F(ExtensionUpdaterTest, TestSingleExtensionDownloadingPendingWithRetry) {
TestSingleExtensionDownloading(true, true);
}
-TEST_F(ExtensionUpdaterTest, TestBlacklistDownloading) {
- TestBlacklistDownloading();
-}
-
TEST_F(ExtensionUpdaterTest, TestMultipleExtensionDownloadingUpdatesFail) {
TestMultipleExtensionDownloading(false);
}
@@ -1593,7 +1475,7 @@ TEST_F(ExtensionUpdaterTest, TestNonAutoUpdateableLocations) {
ServiceForManifestTests service(prefs_.get());
ExtensionUpdater updater(&service, service.extension_prefs(),
service.pref_service(), service.profile(),
- service.blacklist(), kUpdateFrequencySecs);
+ kUpdateFrequencySecs);
MockExtensionDownloaderDelegate delegate;
// Set the downloader directly, so that all its events end up in the mock
// |delegate|.
@@ -1616,7 +1498,6 @@ TEST_F(ExtensionUpdaterTest, TestNonAutoUpdateableLocations) {
service.set_extensions(extensions);
ExtensionUpdater::CheckParams params;
- params.check_blacklist = false;
updater.Start();
updater.CheckNow(params);
}
@@ -1626,7 +1507,7 @@ TEST_F(ExtensionUpdaterTest, TestUpdatingDisabledExtensions) {
ServiceForManifestTests service(prefs_.get());
ExtensionUpdater updater(&service, service.extension_prefs(),
service.pref_service(), service.profile(),
- service.blacklist(), kUpdateFrequencySecs);
+ kUpdateFrequencySecs);
MockExtensionDownloaderDelegate delegate;
// Set the downloader directly, so that all its events end up in the mock
// |delegate|.
@@ -1655,7 +1536,6 @@ TEST_F(ExtensionUpdaterTest, TestUpdatingDisabledExtensions) {
service.set_extensions(enabled_extensions);
service.set_disabled_extensions(disabled_extensions);
ExtensionUpdater::CheckParams params;
- params.check_blacklist = false;
updater.Start();
updater.CheckNow(params);
}
@@ -1733,7 +1613,7 @@ TEST_F(ExtensionUpdaterTest, TestCheckSoon) {
net::TestURLFetcherFactory factory;
ExtensionUpdater updater(
&service, service.extension_prefs(), service.pref_service(),
- service.profile(), service.blacklist(), kUpdateFrequencySecs);
+ service.profile(), kUpdateFrequencySecs);
EXPECT_FALSE(updater.WillCheckSoon());
updater.Start();
EXPECT_FALSE(updater.WillCheckSoon());
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.cc ('k') | chrome/browser/safe_browsing/database_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698