Fix crash when using non-static CLD and update translate.gypi

components/translate/content/browser/data_file_browser_cld_data_provider.cc

 // Copyright 2014 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 "data_file_browser_cld_data_provider.h"
 
 #include "base/basictypes.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/path_service.h"
 #include "base/synchronization/lock.h"
 #include "base/task_runner.h"
 #include "components/translate/content/common/data_file_cld_data_provider_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/web_contents.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 
 namespace {
 // The data file,  cached as long as the process stays alive.
 // We also track the offset at which the data starts, and its length.
 base::FilePath g_cached_filepath;  // guarded by g_file_lock_
 base::File* g_cached_file = NULL;  // guarded by g_file_lock_
 uint64 g_cached_data_offset = -1;  // guarded by g_file_lock_
 uint64 g_cached_data_length = -1;  // guarded by g_file_lock_
 
 // Guards g_cached_filepath
 base::LazyInstance<base::Lock> g_file_lock_;
 }  // namespace
 
 namespace translate {
 
 // Implementation of the static factory method from BrowserCldDataProvider,
 // hooking up this specific implementation for all of Chromium.
 BrowserCldDataProvider* CreateBrowserCldDataProviderFor(
-    content::RenderViewHost* render_view_host) {
-  return new DataFileBrowserCldDataProvider(render_view_host);
+    content::WebContents* web_contents) {
+  return new DataFileBrowserCldDataProvider(web_contents);
 }
 
 void DataFileBrowserCldDataProvider::SetCldDataFilePath(
     const base::FilePath& path) {
   VLOG(1) << "Setting CLD data file path to: " << path.value();
   base::AutoLock lock(g_file_lock_.Get());
   if (g_cached_filepath == path)
     return;  // no change necessary
   g_cached_filepath = path;
   // For sanity, clean these other values up just in case.
   g_cached_file = NULL;
   g_cached_data_length = -1;
   g_cached_data_offset = -1;
 }
 
 base::FilePath DataFileBrowserCldDataProvider::GetCldDataFilePath() {
   base::AutoLock lock(g_file_lock_.Get());
   return g_cached_filepath;
 }
 
 DataFileBrowserCldDataProvider::DataFileBrowserCldDataProvider(
-    content::RenderViewHost* render_view_host)
-    : render_view_host_(render_view_host), weak_pointer_factory_() {
+    content::WebContents* web_contents)
+    : web_contents_(web_contents), weak_pointer_factory_() {
 }
 
 DataFileBrowserCldDataProvider::~DataFileBrowserCldDataProvider() {
 }
 
 bool DataFileBrowserCldDataProvider::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(DataFileBrowserCldDataProvider, message)
   IPC_MESSAGE_HANDLER(ChromeViewHostMsg_NeedCldDataFile, OnCldDataRequest)
@@ skipping 57 matching lines @@
 
   if (handle && handle->IsValid())
     SendCldDataResponseInternal(handle, data_offset, data_length);
 }
 
 void DataFileBrowserCldDataProvider::SendCldDataResponseInternal(
     const base::File* handle,
     const uint64 data_offset,
     const uint64 data_length) {
   VLOG(1) << "Sending CLD data file response.";
+
+  content::RenderViewHost* render_view_host =
+      web_contents_->GetRenderViewHost();
+  if (render_view_host == NULL) {
+    // Render view destroyed, no need to bother.
+    VLOG(1) << "Lost render view host, giving up";
+    return;
+  }
+
+  content::RenderProcessHost* render_process_host =
+      render_view_host->GetProcess();
+  if (render_process_host == NULL) {
+    // Render process destroyed, render view not yet dead. No need to bother.
+    VLOG(1) << "Lost render process, giving up";
+    return;
+  }
+
   // Data available, respond to the request.
+  const int render_process_handle = render_process_host->GetHandle();
   IPC::PlatformFileForTransit ipc_platform_file =
       IPC::GetFileHandleForProcess(handle->GetPlatformFile(),
-                                   render_view_host_->GetProcess()->GetHandle(),
-                                   false);
+                                   render_process_handle, false);
+
   // In general, sending a response from within the code path that is processing
   // a request is discouraged because there is potential for deadlock (if the
   // methods are sent synchronously) or loops (if the response can trigger a
   // new request). Neither of these concerns is relevant in this code, so
   // sending the response from within the code path of the request handler is
   // safe.
-  render_view_host_->Send(
-      new ChromeViewMsg_CldDataFileAvailable(render_view_host_->GetRoutingID(),
+  render_view_host->Send(
+      new ChromeViewMsg_CldDataFileAvailable(render_view_host->GetRoutingID(),
                                              ipc_platform_file,
                                              data_offset,
                                              data_length));
 }
 
 void DataFileBrowserCldDataProvider::OnCldDataRequestInternal() {
   // Because this function involves arbitrary file system access, it must run
   // on the blocking pool.
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
   DCHECK(!content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ skipping 49 matching lines @@
       // Else, this request has taken care of it all. Cache all info.
       VLOG(1) << "Caching CLD data file information.";
       g_cached_file = file.release();
       g_cached_data_offset = data_offset;
       g_cached_data_length = data_length;
     }
   }
 }
 
 }  // namespace translate