Add the session id attribute to the component updater protocol.
Bug: 809760
Change-Id: Ia34c70ba563cdd11fbff2d545533c66df9a94601
Reviewed-on: https://chromium-review.googlesource.com/904945
Reviewed-by: Joshua Pawlicki <[email protected]>
Commit-Queue: Sorin Jianu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#535103}diff --git a/components/update_client/update_client_unittest.cc b/components/update_client/update_client_unittest.cc
index 57fefe0..56d4a15b 100644
--- a/components/update_client/update_client_unittest.cc
+++ b/components/update_client/update_client_unittest.cc
@@ -240,11 +240,13 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
const std::string id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -350,7 +352,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -376,7 +379,7 @@
</app>
</response>
*/
-
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(2u, ids_to_check.size());
@@ -560,7 +563,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -600,6 +604,7 @@
</app>
</response>
*/
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(2u, ids_to_check.size());
@@ -828,7 +833,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -869,6 +875,7 @@
</response>
*/
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(2u, ids_to_check.size());
@@ -1095,11 +1102,14 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
+
static int num_call = 0;
++num_call;
@@ -1421,7 +1431,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -1447,6 +1458,8 @@
</app>
</response>
*/
+ EXPECT_FALSE(session_id.empty());
+
const std::string id = "jebgalgnebhfojomionfpkfelancnnkf";
EXPECT_EQ(id, ids_to_check[0]);
EXPECT_EQ(1u, components.count(id));
@@ -1608,11 +1621,14 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
+
static int num_call = 0;
++num_call;
@@ -1909,11 +1925,13 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
const std::string id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -2020,7 +2038,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -2046,6 +2065,7 @@
</app>
</response>
*/
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
@@ -2211,11 +2231,13 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
const std::string id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -2315,11 +2337,14 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
- UpdateCheckCallback update_check_callback) override {}
+ UpdateCheckCallback update_check_callback) override {
+ NOTREACHED();
+ }
};
class FakeCrxDownloader : public CrxDownloader {
@@ -2364,11 +2389,14 @@
return nullptr;
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
- UpdateCheckCallback update_check_callback) override {}
+ UpdateCheckCallback update_check_callback) override {
+ NOTREACHED();
+ }
};
class FakeCrxDownloader : public CrxDownloader {
@@ -2462,11 +2490,14 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
+
static int num_call = 0;
++num_call;
@@ -2635,7 +2666,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -2680,8 +2712,8 @@
// configurator instance, persists its value in the corresponding
// update context, and propagates it down to each of the update actions,
// and further down to the UpdateChecker instance.
+ EXPECT_FALSE(session_id.empty());
EXPECT_FALSE(enabled_component_updates);
-
EXPECT_EQ(2u, ids_to_check.size());
{
@@ -2881,11 +2913,13 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
UpdateCheckCallback update_check_callback) override {
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
const std::string id = "jebgalgnebhfojomionfpkfelancnnkf";
@@ -2961,7 +2995,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -2989,6 +3024,7 @@
</app>
</response>
*/
+ EXPECT_FALSE(session_id.empty());
EXPECT_TRUE(enabled_component_updates);
EXPECT_EQ(1u, ids_to_check.size());
@@ -3122,7 +3158,8 @@
return std::make_unique<FakeUpdateChecker>();
}
- void CheckForUpdates(const std::vector<std::string>& ids_to_check,
+ void CheckForUpdates(const std::string& session_id,
+ const std::vector<std::string>& ids_to_check,
const IdToComponentPtrMap& components,
const std::string& additional_attributes,
bool enabled_component_updates,
@@ -3141,6 +3178,7 @@
</app>
</response>
*/
+ EXPECT_FALSE(session_id.empty());
EXPECT_EQ(1u, ids_to_check.size());
const std::string id = "gjpmebpgbhcamgdgjcmnjfhggjpgcimm";
EXPECT_EQ(id, ids_to_check[0]);
