Add reset option to the setDeviceData API

If the data parameter is undefined the API will clear the current stored
data and delete the file used to store as well as its immediate folder
if it has become empty.

BUG=1044673
TEST=unit_tests

Change-Id: I2f4dd796c9b0e4eea2474def32a47924d0195ccc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2015168Reviewed-by: Owen Min <zmin@chromium.org>
Reviewed-by: Karan Bhatia <karandeepb@chromium.org>
Commit-Queue: Julian Pastarmov <pastarmovj@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735346}

chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc

@@ -419,7 +419,7 @@ GenerateChromeDesktopReportRequest(const base::DictionaryValue& report,
 }
 
 void StoreDeviceData(const std::string& id,
-                     const std::vector<uint8_t>& data,
+                     const std::unique_ptr<std::vector<uint8_t>> data,
                      base::OnceCallback<void(bool)> callback) {
   base::FilePath data_file = GetEndpointVerificationDir();
   if (data_file.empty()) {
@@ -431,28 +431,36 @@ void StoreDeviceData(const std::string& id,
   // subdir+file of the EV folder.
   data_file = data_file.AppendASCII(id);
 
-  // Ensure the directory exists.
-  bool success = base::CreateDirectory(data_file.DirName());
-  if (!success) {
-    LOG(ERROR) << "Could not create directory: "
-               << data_file.DirName().LossyDisplayName();
-    std::move(callback).Run(false);
-    return;
-  }
+  bool success = false;
+  if (data) {
+    // Ensure the directory exists.
+    success = base::CreateDirectory(data_file.DirName());
+    if (!success) {
+      LOG(ERROR) << "Could not create directory: "
+                 << data_file.DirName().LossyDisplayName();
+      std::move(callback).Run(false);
+      return;
+    }
 
-  base::FilePath tmp_path;
-  success = base::CreateTemporaryFileInDir(data_file.DirName(), &tmp_path);
-  if (!success) {
-    LOG(ERROR) << "Could not open file for writing: "
-               << tmp_path.LossyDisplayName();
-    std::move(callback).Run(false);
-    return;
-  }
+    base::FilePath tmp_path;
+    success = base::CreateTemporaryFileInDir(data_file.DirName(), &tmp_path);
+    if (!success) {
+      LOG(ERROR) << "Could not open file for writing: "
+                 << tmp_path.LossyDisplayName();
+      std::move(callback).Run(false);
+      return;
+    }
 
-  base::WriteFile(tmp_path, reinterpret_cast<const char*>(data.data()),
-                  data.size());
+    base::WriteFile(tmp_path, reinterpret_cast<const char*>(data->data()),
+                    data->size());
+    success = base::Move(tmp_path, data_file);
+  } else {
+    // Not passing a second parameter means clear the data sored under |id|.
+    success = base::DeleteFile(data_file, false);
+    if (base::IsDirectoryEmpty(data_file.DirName()))
+      base::DeleteFile(data_file.DirName(), false);
+  }
 
-  success = base::Move(tmp_path, data_file);
   std::move(callback).Run(success);
 }
 

chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.h

@@ -29,7 +29,7 @@ GenerateChromeDesktopReportRequest(const base::DictionaryValue& report,
 // Store the |data| associated with the identifier |id|. Calls |callback| on
 // completion with true on success.
 void StoreDeviceData(const std::string& id,
-                     const std::vector<uint8_t>& data,
+                     const std::unique_ptr<std::vector<uint8_t>> data,
                      base::OnceCallback<void(bool)> callback);
 
 // Retrieves the data associated with the identifier |id|. Calls |callback| on

chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc

@@ -266,7 +266,7 @@ EnterpriseReportingPrivateSetDeviceDataFunction::Run() {
       {base::ThreadPool(), base::MayBlock(),
        base::TaskShutdownBehavior::CONTINUE_ON_SHUTDOWN},
       base::BindOnce(
-          &StoreDeviceData, params->id, params->data,
+          &StoreDeviceData, params->id, std::move(params->data),
           base::BindOnce(
               &EnterpriseReportingPrivateSetDeviceDataFunction::OnDataStored,
               this)));

chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_unittest.cc

@@ -242,6 +242,29 @@ TEST_F(EnterpriseReportingPrivateDeviceDataFunctionsTest, RetrieveDeviceData) {
   ASSERT_TRUE(single_result);
   ASSERT_TRUE(single_result->is_blob());
   EXPECT_EQ(base::Value::BlobStorage({1, 2, 3}), single_result->GetBlob());
+
+  // Clear the data and check that it is gone.
+  auto set_function2 =
+      base::MakeRefCounted<EnterpriseReportingPrivateSetDeviceDataFunction>();
+  std::unique_ptr<base::ListValue> reset_values =
+      std::make_unique<base::ListValue>();
+  reset_values->AppendString("c");
+  extension_function_test_utils::RunFunction(set_function2.get(),
+                                             std::move(reset_values), browser(),
+                                             extensions::api_test_utils::NONE);
+  ASSERT_TRUE(set_function2->GetError().empty());
+
+  auto get_function2 =
+      base::MakeRefCounted<EnterpriseReportingPrivateGetDeviceDataFunction>();
+  std::unique_ptr<base::ListValue> values2 =
+      std::make_unique<base::ListValue>();
+  values2->AppendString("c");
+  extension_function_test_utils::RunFunction(get_function2.get(),
+                                             std::move(values2), browser(),
+                                             extensions::api_test_utils::NONE);
+  ASSERT_TRUE(get_function2->GetResultList());
+  EXPECT_EQ(0u, get_function2->GetResultList()->GetSize());
+  EXPECT_FALSE(get_function2->GetError().empty());
 }
 
 // TODO(pastarmovj): Remove once implementation for the other platform exists.

chrome/common/extensions/api/enterprise_reporting_private.idl

@@ -55,9 +55,11 @@ namespace enterprise.reportingPrivate {
     // Gets the device data for |id|. Sets runtime.lastError on failure.
     static void getDeviceData(DOMString id, GetDeviceDataCallback callback);
 
-    // Sets the device data for |id|. Sets runtime.lastError on failure.
+    // Sets the device data for |id|. Sets runtime.lastError on failure. If the
+    // |data| parameter is undefined and there is already data associated with
+    // |id| it will be cleared.
     static void setDeviceData(DOMString id,
-             ArrayBuffer data,
+             optional ArrayBuffer data,
              optional DoneCallback callback);
 
     // Gets the device information (including disk encryption status,