First pass at fixing guest browser cookies issue.

chrome/browser/profiles/profile_destroyer.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 "chrome/browser/profiles/profile_destroyer.h"
 
 #include "base/bind.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/trace_event/trace_event.h"
+#include "chrome/browser/browser_process.h"
+#include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/user_manager.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
+#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 
 namespace {
 
 #if defined(OS_ANDROID)
 // Set the render host waiting time to 5s on Android, that's the same
 // as an "Application Not Responding" timeout.
 const int64 kTimerDelaySeconds = 5;
 #else
 const int64 kTimerDelaySeconds = 1;
@@ skipping 28 matching lines @@
   // --single-process mode to avoid race conditions.
   DCHECK(hosts.empty() || profile->IsOffTheRecord() ||
       content::RenderProcessHost::run_renderer_in_process()) << \
       "Profile still has " << hosts.size() << " hosts";
   // Note that we still test for !profile->IsOffTheRecord here even though we
   // DCHECK'd above because we want to protect Release builds against this even
   // we need to identify if there are leaks when we run Debug builds.
   if (hosts.empty() || !profile->IsOffTheRecord()) {
     if (profile->IsOffTheRecord())
       profile->GetOriginalProfile()->DestroyOffTheRecordProfile();
-    else
+    else { DLOG(ERROR) << "Delete the profile! " << profile->GetPath().MaybeAsASCII();
       delete profile;
+    }
   } else {
     // The instance will destroy itself once all render process hosts referring
     // to it are properly terminated.
     new ProfileDestroyer(profile, &hosts);
   }
 }
 
 // This can be called to cancel any pending destruction and destroy the profile
 // now, e.g., if the parent profile is being destroyed while the incognito one
 // still pending...
@@ skipping 10 matching lines @@
         NOTREACHED() << "A render process host wasn't destroyed early enough.";
         (*i)->profile_ = NULL;
         break;
       }
     }
   }
   DCHECK(profile->GetOriginalProfile());
   profile->GetOriginalProfile()->DestroyOffTheRecordProfile();
 }
 
+// static
+void ProfileDestroyer::DestroyGuestProfileIfAppropriate() {
+  ProfileManager* profile_manager = g_browser_process->profile_manager();
+  DCHECK(profile_manager);
+  Profile* guest_profile = profile_manager->
+      GetProfileByPath(ProfileManager::GetGuestProfilePath());
+  DLOG(ERROR) << "Calling DestroyGuestProfileIfAppropriate!";
+  if (!guest_profile)
+    return;
+
+  if (BrowserList::IsOffTheRecordSessionActiveForProfile(guest_profile))
+    return;
+
+  DLOG(ERROR) << "Deleting the Guest Profile!";
+
+  content::BrowserThread::PostTask(
+      content::BrowserThread::UI,
+      FROM_HERE,
+      base::Bind(&ProfileDestroyer::DestroyProfileWhenAppropriate,
+                 guest_profile));
+}
+
 ProfileDestroyer::ProfileDestroyer(Profile* const profile, HostSet* hosts)
     : timer_(false, false),
       num_hosts_(0),
       profile_(profile),
       weak_ptr_factory_(this) {
   if (pending_destroyers_ == NULL)
     pending_destroyers_ = new DestroyerSet;
   pending_destroyers_->insert(this);
   for (HostSet::iterator i = hosts->begin(); i != hosts->end(); ++i) {
     (*i)->AddObserver(this);
@@ skipping 46 matching lines @@
   }
 }
 
 void ProfileDestroyer::DestroyProfile() {
   // We might have been cancelled externally before the timer expired.
   if (!profile_) {
     delete this;
     return;
   }
 
-  DCHECK(profile_->IsOffTheRecord());
+  DCHECK(profile_->IsOffTheRecord() || profile_->IsGuestSession());
   DCHECK(profile_->GetOriginalProfile());
   profile_->GetOriginalProfile()->DestroyOffTheRecordProfile();
   profile_ = NULL;
 
   // And stop the timer so we can be released early too.
   timer_.Stop();
 
   delete this;
 }
 
 // static
 bool ProfileDestroyer::GetHostsForProfile(
     Profile* const profile, HostSet* hosts) {
   for (content::RenderProcessHost::iterator iter(
         content::RenderProcessHost::AllHostsIterator());
       !iter.IsAtEnd(); iter.Advance()) {
     content::RenderProcessHost* render_process_host = iter.GetCurrentValue();
     if (render_process_host &&
             render_process_host->GetBrowserContext() == profile) {
       hosts->insert(render_process_host);
     }
   }
   return !hosts->empty();
 }