Merge 197214 "Detect when chrome is shutting down and don't Send..."

rlz/lib/financial_ping.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.
 //
 // Library functions related to the Financial Server ping.
 
 #include "rlz/lib/financial_ping.h"
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 247 matching lines @@
 
   DWORD bytes_read = 0;
   while (InternetReadFile(http_handle, buffer.get(), kMaxPingResponseLength,
                           &bytes_read) && bytes_read > 0) {
     response->append(buffer.get(), bytes_read);
     bytes_read = 0;
   };
 
   return true;
 #else
+  // Browser shutdown will cause the context to be reset to NULL.
+  if (!g_context)
+    return false;
+
   // Run a blocking event loop to match the win inet implementation.
   scoped_ptr<MessageLoop> message_loop;
   // Ensure that we have a MessageLoop.
   if (!MessageLoop::current())
     message_loop.reset(new MessageLoop);
   base::RunLoop loop;
   FinancialPingUrlFetcherDelegate delegate(loop.QuitClosure());
 
   std::string url = base::StringPrintf("http://%s:%d%s",
                                        kFinancialServer, kFinancialPort,
                                        request);
 
   scoped_ptr<net::URLFetcher> fetcher(net::URLFetcher::Create(
       GURL(url), net::URLFetcher::GET, &delegate));
 
   fetcher->SetLoadFlags(net::LOAD_DISABLE_CACHE |
                         net::LOAD_DO_NOT_SEND_AUTH_DATA |
                         net::LOAD_DO_NOT_PROMPT_FOR_LOGIN |
                         net::LOAD_DO_NOT_SEND_COOKIES |
                         net::LOAD_DO_NOT_SAVE_COOKIES);
 
   // Ensure rlz_lib::SetURLRequestContext() has been called before sending
   // pings.
-  CHECK(g_context);
   fetcher->SetRequestContext(g_context);
 
   const base::TimeDelta kTimeout = base::TimeDelta::FromMinutes(5);
   MessageLoop::ScopedNestableTaskAllower allow_nested(MessageLoop::current());
   MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&net::URLFetcher::Start, base::Unretained(fetcher.get())));
   MessageLoop::current()->PostDelayedTask(
       FROM_HERE, loop.QuitClosure(), kTimeout);
 
@@ skipping 47 matching lines @@
 
 bool FinancialPing::ClearLastPingTime(Product product) {
   ScopedRlzValueStoreLock lock;
   RlzValueStore* store = lock.GetStore();
   if (!store || !store->HasAccess(RlzValueStore::kWriteAccess))
     return false;
   return store->ClearPingTime(product);
 }
 
 }  // namespace