[Chromedriver] Retry deleting temp dir when needed

chrome/test/chromedriver/session.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_CHROMEDRIVER_SESSION_H_
 #define CHROME_TEST_CHROMEDRIVER_SESSION_H_
 
 #include <list>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "base/files/scoped_temp_dir.h"
 #include "base/time/time.h"
 #include "chrome/test/chromedriver/basic_types.h"
 #include "chrome/test/chromedriver/chrome/device_metrics.h"
 #include "chrome/test/chromedriver/chrome/geoposition.h"
 #include "chrome/test/chromedriver/chrome/network_conditions.h"
+#include "chrome/test/chromedriver/chrome/scoped_temp_dir_with_retry.h"
 #include "chrome/test/chromedriver/command_listener.h"
 
 static const char kAccept[] = "accept";
 static const char kDismiss[] = "dismiss";
 static const char kIgnore[] = "ignore";
 
 namespace base {
 class DictionaryValue;
 }
 
@@ skipping 46 matching lines @@
   base::TimeDelta page_load_timeout;
   base::TimeDelta script_timeout;
   std::unique_ptr<std::string> prompt_text;
   std::unique_ptr<Geoposition> overridden_geoposition;
   std::unique_ptr<DeviceMetrics> overridden_device_metrics;
   std::unique_ptr<NetworkConditions> overridden_network_conditions;
   std::string orientation_type;
   // Logs that populate from DevTools events.
   std::vector<std::unique_ptr<WebDriverLog>> devtools_logs;
   std::unique_ptr<WebDriverLog> driver_log;
-  base::ScopedTempDir temp_dir;
+  ScopedTempDirWithRetry temp_dir;
   std::unique_ptr<base::DictionaryValue> capabilities;
   bool auto_reporting_enabled;
   // |command_listeners| should be declared after |chrome|. When the |Session|
   // is destroyed, |command_listeners| should be freed first, since some
   // |CommandListener|s might be |CommandListenerProxy|s that forward to
   // |DevToolsEventListener|s owned by |chrome|.
   std::vector<std::unique_ptr<CommandListener>> command_listeners;
   std::string unexpected_alert_behaviour;
 };
 
 Session* GetThreadLocalSession();
 
 void SetThreadLocalSession(std::unique_ptr<Session> session);
 
 #endif  // CHROME_TEST_CHROMEDRIVER_SESSION_H_