Fix file leaks in a ETW test and a ScopedTempDir test.

base/win/event_trace_controller_unittest.cc

 // Copyright (c) 2011 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.
 //
 // Unit tests for event trace controller.
 
 #include <initguid.h>  // NOLINT.
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 123 matching lines @@
   EXPECT_STREQ(kTestSessionName, controller.session_name());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   EXPECT_EQ(NULL, controller.session());
   EXPECT_STREQ(L"", controller.session_name());
 }
 
 TEST(EtwTraceControllerTest, StartFileSession) {
   FilePath temp;
 
   ASSERT_HRESULT_SUCCEEDED(file_util::CreateTemporaryFile(&temp));

[Sigurður Ásgeirsson, 2011/12/16 13:59:45]

can this be a ScopedTempDir instead?

[Lei Zhang, 2011/12/16 20:00:22]

Sure, in patch set 3.

 
   EtwTraceController controller;
   HRESULT hr = controller.StartFileSession(kTestSessionName,
                                            temp.value().c_str());
   if (hr == E_ACCESSDENIED) {
     VLOG(1) << "You must be an administrator to run this test on Vista";
+    file_util::Delete(temp, false);
     return;
   }
 
   EXPECT_TRUE(NULL != controller.session());
   EXPECT_STREQ(kTestSessionName, controller.session_name());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
   EXPECT_EQ(NULL, controller.session());
   EXPECT_STREQ(L"", controller.session_name());
+  file_util::Delete(temp, false);
 }
 
 TEST(EtwTraceControllerTest, EnableDisable) {
   TestingProvider provider(kTestProvider);
 
   EXPECT_EQ(ERROR_SUCCESS, provider.Register());
   EXPECT_EQ(NULL, provider.session_handle());
 
   EtwTraceController controller;
   HRESULT hr = controller.StartRealtimeSession(kTestSessionName, 100 * 1024);
@@ skipping 31 matching lines @@
   EXPECT_EQ(kTestProviderFlags, provider.enable_flags());
 
   EXPECT_HRESULT_SUCCEEDED(controller.Stop(NULL));
 
   provider.WaitForCallback();
 
   // Session should have wound down.
   EXPECT_EQ(0, provider.enable_level());
   EXPECT_EQ(0, provider.enable_flags());
 }