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

chrome/browser/rlz/rlz.h

 // 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.
 
 #ifndef CHROME_BROWSER_RLZ_RLZ_H_
 #define CHROME_BROWSER_RLZ_RLZ_H_
 
 #include "build/build_config.h"
 
 #if defined(ENABLE_RLZ)
@@ skipping 183 matching lines @@
   bool first_run_;
   bool send_ping_immediately_;
   bool is_google_default_search_;
   bool is_google_homepage_;
   bool is_google_in_startpages_;
 
   // Unique sequence token so that tasks posted by RLZTracker are executed
   // sequentially in the blocking pool.
   base::SequencedWorkerPool::SequenceToken worker_pool_token_;
 
-  // URLRequestContextGetter used by RLZ library.
-  net::URLRequestContextGetter* url_request_context_;
-
   // Keeps track if the RLZ tracker has already performed its delayed
   // initialization.
   bool already_ran_;
 
   // Keeps a cache of RLZ access point strings, since they rarely change.
   // The cache must be protected by a lock since it may be accessed from
   // the UI thread for reading and the IO thread for reading and/or writing.
   base::Lock cache_lock_;
   std::map<rlz_lib::AccessPoint, string16> rlz_cache_;
 
   // Keeps track of whether the omnibox or host page have been used.
   bool omnibox_used_;
   bool homepage_used_;
 
   // Main and (optionally) reactivation brand codes, assigned on UI thread.
   std::string brand_;
   std::string reactivation_brand_;
 
   content::NotificationRegistrar registrar_;
 
   // Minimum delay before sending financial ping after initialization.
   base::TimeDelta min_init_delay_;
 
   DISALLOW_COPY_AND_ASSIGN(RLZTracker);
 };
 
 #endif  // defined(ENABLE_RLZ)
 
 #endif  // CHROME_BROWSER_RLZ_RLZ_H_