Fix race condition in utility process clients

content/browser/indexed_db/idbbindingutilities_browsertest.cc

 // 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.
 
 #include "base/bind.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/browser/utility_process_host.h"
@@ skipping 90 matching lines @@
   ASSERT_EQ(WebKit::WebIDBKey::NullType, values[0].type());
   ASSERT_EQ(WebKit::WebIDBKey::NullType, values[1].type());
   ASSERT_EQ(WebKit::WebIDBKey::NullType, values[2].type());
   ASSERT_EQ(WebKit::WebIDBKey::NullType, values[3].type());
 }
 
 class IDBKeyPathHelper : public UtilityProcessHost::Client {
  public:
   IDBKeyPathHelper()
       : expected_id_(0),
-        utility_process_host_(NULL),
         value_for_key_path_failed_(false) {
   }
 
   void CreateUtilityProcess() {
     if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&IDBKeyPathHelper::CreateUtilityProcess, this));
       return;
     }
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     utility_process_host_ =
-        new UtilityProcessHost(this, BrowserThread::IO);
+        (new UtilityProcessHost(this, BrowserThread::IO))->AsWeakPtr();
     utility_process_host_->set_use_linux_zygote(true);
     utility_process_host_->StartBatchMode();
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             MessageLoop::QuitClosure());
   }
 
   void DestroyUtilityProcess() {
     if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
       BrowserThread::PostTask(
           BrowserThread::IO, FROM_HERE,
           base::Bind(&IDBKeyPathHelper::DestroyUtilityProcess, this));
       return;
     }
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
     utility_process_host_->EndBatchMode();
-    utility_process_host_ = NULL;
+    utility_process_host_.reset();
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             MessageLoop::QuitClosure());
   }
 
   void SetExpectedKeys(int expected_id,
                        const std::vector<IndexedDBKey>& expected_keys,
                        bool failed) {
     expected_id_ = expected_id;
     expected_keys_ = expected_keys;
     value_for_key_path_failed_ = failed;
@@ skipping 81 matching lines @@
   void OnInjectIDBKeyFinished(const content::SerializedScriptValue& new_value) {
     EXPECT_EQ(expected_value_.data(), new_value.data());
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
                             MessageLoop::QuitClosure());
   }
 
 
  private:
   int expected_id_;
   std::vector<IndexedDBKey> expected_keys_;
-  UtilityProcessHost* utility_process_host_;
+  base::WeakPtr<UtilityProcessHost> utility_process_host_;
   bool value_for_key_path_failed_;
   content::SerializedScriptValue expected_value_;
 };
 
 // This test fixture runs in the UI thread. However, most of the work done by
 // UtilityProcessHost (and wrapped by IDBKeyPathHelper above) happens on the IO
 // thread. This fixture delegates to IDBKeyPathHelper and blocks via
 // "ui_test_utils::RunMessageLoop()", until IDBKeyPathHelper posts a quit
 // message the MessageLoop.
 class ScopedIDBKeyPathHelper {
@@ skipping 174 matching lines @@
                                    0x6f6f, 0x013f, 0x0353, 0x6f7a, 0x3f6f,
                                    0x5301, 0x6203, 0x7261, 0x013f, 0x3f6f,
                                    0x5302, 0x6203, 0x7a61, 0x023f, 0x0853,
                                    0x796d, 0x654e, 0x4b77, 0x7965, 0x017b,
                                    0x027b};
   content::SerializedScriptValue expected_value2(
       false, false, string16(expected_data2, arraysize(expected_data2)));
   scoped_helper.SetExpectedValue(expected_value2);
   scoped_helper.CheckInjectValue(key, value, UTF8ToUTF16("bar.baz"));
 }