Fix an ownership issue in ScopedAgentLogger

syzygy/integration_tests/instrument_integration_test.cc

 // Copyright 2013 Google Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 78 matching lines @@
 // and getting the contents of its log file. Not thread safe.
 struct ScopedAgentLogger {
   explicit ScopedAgentLogger(base::FilePath temp_dir)
       : nul_(NULL), temp_dir_(temp_dir) {
     agent_logger_ = testing::GetOutputRelativePath(
         L"agent_logger.exe");
     instance_id_ = base::StringPrintf("integra%08X", ::GetCurrentProcessId());
   }
 
   ~ScopedAgentLogger() {
-    // Clean up the temp directory if we created one.
-    if (!temp_dir_.empty())
-      base::DeleteFile(temp_dir_, true);
-
     if (nul_) {
       ::CloseHandle(nul_);
       nul_ = NULL;
     }
   }
 
   void RunAction(const char* action, base::Process* process) {
     DCHECK_NE(static_cast<const char*>(nullptr), action);
     DCHECK_NE(static_cast<base::Process*>(nullptr), process);
 
@@ skipping 48 matching lines @@
 
   void GetLog(std::string* log) {
     DCHECK_NE(static_cast<std::string*>(nullptr), log);
     *log = log_contents_;
   }
 
   // Initialized at construction.
   base::FilePath agent_logger_;
   std::string instance_id_;
 
+  // The temp directory used by this logger. This is owned by the object that
+  // owns this logger.
+  base::FilePath temp_dir_;
+
   // Modified by Start and Stop.
-  base::FilePath temp_dir_;
   base::FilePath log_file_;
   base::Process process_;
   HANDLE nul_;
 
   // Modified by Stop.
   std::string log_contents_;
 };
 
 enum AccessMode {
   ASAN_READ_ACCESS = agent::asan::ASAN_READ_ACCESS,
@@ skipping 1577 matching lines @@
 
 TEST_F(InstrumentAppIntegrationTest, DeferredFreeTLS) {
   ASSERT_NO_FATAL_FAILURE(StartService());
   ASSERT_NO_FATAL_FAILURE(EndToEndTest("asan"));
   ASSERT_EQ(0, InvokeTestDllFunction(testing::kAsanDeferredFreeTLS));
   ASSERT_NO_FATAL_FAILURE(UnloadDll());
   ASSERT_NO_FATAL_FAILURE(StopService());
 }
 
 }  // namespace integration_tests