Deal correctly with BrowsingData API calls during startup.

chrome/browser/extensions/api/browsing_data/browsing_data_api.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.
 
 // Defines the Chrome Extensions BrowsingData API functions, which entail
 // clearing browsing data, and clearing the browser's cache (which, let's be
 // honest, are the same thing), as specified in the extension API JSON.
 
 #include "chrome/browser/extensions/api/browsing_data/browsing_data_api.h"
 
@@ skipping 98 matching lines @@
 }  // namespace
 
 void BrowsingDataExtensionFunction::OnBrowsingDataRemoverDone() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   this->SendResponse(true);
 
   Release();  // Balanced in RunImpl.
 }
 
 bool BrowsingDataExtensionFunction::RunImpl() {
+  // If we don't have a profile, something's pretty wrong.
+  DCHECK(profile());
+
   if (BrowsingDataRemover::is_removing()) {
     error_ = extension_browsing_data_api_constants::kOneAtATimeError;
     return false;
   }
 
   // Grab the initial |options| parameter, and parse out the arguments.
   DictionaryValue* options;
   EXTENSION_FUNCTION_VALIDATE(args_->GetDictionary(0, &options));
   DCHECK(options);
 
@@ skipping 11 matching lines @@
   // object. So we need to do special handling here.
   remove_since_ = (ms_since_epoch == 0) ?
       base::Time::UnixEpoch() :
       base::Time::FromDoubleT(ms_since_epoch / 1000.0);
 
   removal_mask_ = GetRemovalMask();
 
   if (removal_mask_ & BrowsingDataRemover::REMOVE_PLUGIN_DATA) {
     // If we're being asked to remove plugin data, check whether it's actually
     // supported.
-    Profile* profile = GetCurrentBrowser()->profile();
     BrowserThread::PostTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(
             &BrowsingDataExtensionFunction::CheckRemovingPluginDataSupported,
             this,
-            PluginPrefs::GetForProfile(profile)));
+            PluginPrefs::GetForProfile(profile())));
   } else {
     StartRemoving();
   }
 
   // Will finish asynchronously.
   return true;
 }
 
 void BrowsingDataExtensionFunction::CheckRemovingPluginDataSupported(
     scoped_refptr<PluginPrefs> plugin_prefs) {
   if (!PluginDataRemoverHelper::IsSupported(plugin_prefs))
     removal_mask_ &= ~BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&BrowsingDataExtensionFunction::StartRemoving, this));
 }
 
 void BrowsingDataExtensionFunction::StartRemoving() {
   // If we're good to go, add a ref (Balanced in OnBrowsingDataRemoverDone)
   AddRef();
 
   // Create a BrowsingDataRemover, set the current object as an observer (so
   // that we're notified after removal) and call remove() with the arguments
   // we've generated above. We can use a raw pointer here, as the browsing data
   // remover is responsible for deleting itself once data removal is complete.
-  BrowsingDataRemover* remover = new BrowsingDataRemover(
-      GetCurrentBrowser()->profile(), remove_since_, base::Time::Now());
+  BrowsingDataRemover* remover = new BrowsingDataRemover(profile(),
+      remove_since_, base::Time::Now());
   remover->AddObserver(this);
   remover->Remove(removal_mask_, origin_set_mask_);
 }
 
 int BrowsingDataExtensionFunction::ParseOriginSetMask(
     const base::DictionaryValue& options) {
   // Parse the |options| dictionary to generate the origin set mask. Default to
   // UNPROTECTED_WEB if the developer doesn't specify anything.
   int mask = BrowsingDataHelper::UNPROTECTED_WEB;
 
@@ skipping 84 matching lines @@
   return BrowsingDataRemover::REMOVE_PLUGIN_DATA;
 }
 
 int RemovePasswordsFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_PASSWORDS;
 }
 
 int RemoveWebSQLFunction::GetRemovalMask() const {
   return BrowsingDataRemover::REMOVE_WEBSQL;
 }