summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/updater/extension_updater_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/updater/extension_updater_unittest.cc')
-rw-r--r--chrome/browser/extensions/updater/extension_updater_unittest.cc67
1 files changed, 27 insertions, 40 deletions
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index 3481c0c..4921d9e 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -432,7 +432,7 @@ static void ExtractParameters(const std::string& params,
if (!key_val.empty()) {
std::string key = key_val[0];
EXPECT_TRUE(result->find(key) == result->end());
- (*result)[key] = (key_val.size() == 2) ? key_val[1] : std::string();
+ (*result)[key] = (key_val.size() == 2) ? key_val[1] : "";
} else {
NOTREACHED();
}
@@ -637,8 +637,7 @@ class ExtensionUpdaterTest : public testing::Test {
// Make sure that an empty update URL data string does not cause a ap=
// option to appear in the x= parameter.
ManifestFetchData fetch_data(GURL("http://localhost/foo"), 0);
- fetch_data.AddExtension(
- id, version, &kNeverPingedData, std::string(), std::string());
+ fetch_data.AddExtension(id, version, &kNeverPingedData, "", "");
std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data.full_url().query(), &params);
@@ -654,8 +653,7 @@ class ExtensionUpdaterTest : public testing::Test {
// Make sure that an update URL data string causes an appropriate ap=
// option to appear in the x= parameter.
ManifestFetchData fetch_data(GURL("http://localhost/foo"), 0);
- fetch_data.AddExtension(
- id, version, &kNeverPingedData, "bar", std::string());
+ fetch_data.AddExtension(id, version, &kNeverPingedData, "bar", "");
std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data.full_url().query(), &params);
EXPECT_EQ(id, params["id"]);
@@ -670,8 +668,7 @@ class ExtensionUpdaterTest : public testing::Test {
// Make sure that an update URL data string causes an appropriate ap=
// option to appear in the x= parameter.
ManifestFetchData fetch_data(GURL("http://localhost/foo"), 0);
- fetch_data.AddExtension(
- id, version, &kNeverPingedData, "a=1&b=2&c", std::string());
+ fetch_data.AddExtension(id, version, &kNeverPingedData, "a=1&b=2&c", "");
std::map<std::string, std::string> params;
VerifyQueryAndExtractParameters(fetch_data.full_url().query(), &params);
EXPECT_EQ(id, params["id"]);
@@ -741,12 +738,14 @@ class ExtensionUpdaterTest : public testing::Test {
// installed and available at v2.0).
const std::string id1 = id_util::GenerateId("1");
const std::string id2 = id_util::GenerateId("2");
- fetch_data.AddExtension(
- id1, "1.0.0.0", &kNeverPingedData, kEmptyUpdateUrlData, std::string());
- AddParseResult(id1, "1.1", "http://localhost/e1_1.1.crx", &updates);
- fetch_data.AddExtension(
- id2, "2.0.0.0", &kNeverPingedData, kEmptyUpdateUrlData, std::string());
- AddParseResult(id2, "2.0.0.0", "http://localhost/e2_2.0.crx", &updates);
+ fetch_data.AddExtension(id1, "1.0.0.0",
+ &kNeverPingedData, kEmptyUpdateUrlData, "");
+ AddParseResult(id1, "1.1",
+ "http://localhost/e1_1.1.crx", &updates);
+ fetch_data.AddExtension(id2, "2.0.0.0",
+ &kNeverPingedData, kEmptyUpdateUrlData, "");
+ AddParseResult(id2, "2.0.0.0",
+ "http://localhost/e2_2.0.crx", &updates);
EXPECT_CALL(delegate, IsExtensionPending(_)).WillRepeatedly(Return(false));
EXPECT_CALL(delegate, GetExtensionExistingVersion(id1, _))
@@ -783,11 +782,8 @@ class ExtensionUpdaterTest : public testing::Test {
std::list<std::string>::const_iterator it;
for (it = ids_for_update_check.begin();
it != ids_for_update_check.end(); ++it) {
- fetch_data.AddExtension(*it,
- "1.0.0.0",
- &kNeverPingedData,
- kEmptyUpdateUrlData,
- std::string());
+ fetch_data.AddExtension(*it, "1.0.0.0",
+ &kNeverPingedData, kEmptyUpdateUrlData, "");
AddParseResult(*it, "1.1", "http://localhost/e1_1.1.crx", &updates);
}
@@ -820,14 +816,10 @@ class ExtensionUpdaterTest : public testing::Test {
scoped_ptr<ManifestFetchData> fetch3(new ManifestFetchData(kUpdateUrl, 0));
scoped_ptr<ManifestFetchData> fetch4(new ManifestFetchData(kUpdateUrl, 0));
ManifestFetchData::PingData zeroDays(0, 0, true);
- fetch1->AddExtension(
- "1111", "1.0", &zeroDays, kEmptyUpdateUrlData, std::string());
- fetch2->AddExtension(
- "2222", "2.0", &zeroDays, kEmptyUpdateUrlData, std::string());
- fetch3->AddExtension(
- "3333", "3.0", &zeroDays, kEmptyUpdateUrlData, std::string());
- fetch4->AddExtension(
- "4444", "4.0", &zeroDays, kEmptyUpdateUrlData, std::string());
+ fetch1->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, "");
+ fetch2->AddExtension("2222", "2.0", &zeroDays, kEmptyUpdateUrlData, "");
+ fetch3->AddExtension("3333", "3.0", &zeroDays, kEmptyUpdateUrlData, "");
+ fetch4->AddExtension("4444", "4.0", &zeroDays, kEmptyUpdateUrlData, "");
// This will start the first fetcher and queue the others. The next in queue
// is started as each fetcher receives its response.
@@ -935,8 +927,7 @@ class ExtensionUpdaterTest : public testing::Test {
scoped_ptr<ManifestFetchData> fetch(new ManifestFetchData(kUpdateUrl, 0));
ManifestFetchData::PingData zeroDays(0, 0, true);
- fetch->AddExtension(
- "1111", "1.0", &zeroDays, kEmptyUpdateUrlData, std::string());
+ fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, "");
// This will start the first fetcher.
downloader.StartUpdateCheck(fetch.Pass());
@@ -963,8 +954,7 @@ class ExtensionUpdaterTest : public testing::Test {
// For response codes that are not in the 5xx range ExtensionDownloader
// should not retry.
fetch.reset(new ManifestFetchData(kUpdateUrl, 0));
- fetch->AddExtension(
- "1111", "1.0", &zeroDays, kEmptyUpdateUrlData, std::string());
+ fetch->AddExtension("1111", "1.0", &zeroDays, kEmptyUpdateUrlData, "");
// This will start the first fetcher.
downloader.StartUpdateCheck(fetch.Pass());
@@ -1016,7 +1006,7 @@ class ExtensionUpdaterTest : public testing::Test {
GURL test_url("http://localhost/extension.crx");
std::string id = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
- std::string hash;
+ std::string hash = "";
Version version("0.0.1");
std::set<int> requests;
requests.insert(0);
@@ -1152,8 +1142,8 @@ class ExtensionUpdaterTest : public testing::Test {
std::string id1 = "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa";
std::string id2 = "bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb";
- std::string hash1;
- std::string hash2;
+ std::string hash1 = "";
+ std::string hash2 = "";
std::string version1 = "0.1";
std::string version2 = "0.1";
@@ -1367,7 +1357,7 @@ class ExtensionUpdaterTest : public testing::Test {
fetcher->set_url(fetched_urls[0]);
fetcher->set_status(net::URLRequestStatus());
fetcher->set_response_code(500);
- fetcher->SetResponseString(std::string());
+ fetcher->SetResponseString("");
fetcher->delegate()->OnURLFetchComplete(fetcher);
fetcher = factory.GetFetcherByID(ExtensionDownloader::kManifestFetcherId);
@@ -1452,11 +1442,8 @@ class ExtensionUpdaterTest : public testing::Test {
ManifestFetchData fetch_data(update_url, 0);
const Extension* extension = tmp[0];
- fetch_data.AddExtension(extension->id(),
- extension->VersionString(),
- &kNeverPingedData,
- kEmptyUpdateUrlData,
- std::string());
+ fetch_data.AddExtension(extension->id(), extension->VersionString(),
+ &kNeverPingedData, kEmptyUpdateUrlData, "");
UpdateManifest::Results results;
results.daystart_elapsed_seconds = 750;
@@ -1660,7 +1647,7 @@ TEST_F(ExtensionUpdaterTest, TestManifestFetchesBuilderAddExtension) {
EXPECT_EQ(1u, ManifestFetchersCount(downloader.get()));
// Extensions with empty IDs should be rejected.
- EXPECT_FALSE(downloader->AddPendingExtension(std::string(), GURL(), 0));
+ EXPECT_FALSE(downloader->AddPendingExtension("", GURL(), 0));
downloader->StartAllPending();
EXPECT_EQ(1u, ManifestFetchersCount(downloader.get()));
generated by cgit v1.1 at 2025-01-28 22:20:12 +0000