Resolve new GAIA flow's infinite loop.

chrome/browser/chromeos/profiles/profile_helper.cc

 // Copyright (c) 2013 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/chromeos/profiles/profile_helper.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/profiles/profiles_state.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/browser_thread.h"
+#include "content/public/browser/storage_partition.h"
+#include "content/public/browser/web_contents.h"
+#include "extensions/browser/guest_view/guest_view_base.h"
+#include "extensions/browser/guest_view/guest_view_manager.h"
+#include "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 namespace chromeos {
 
 namespace {
 
 // As defined in /chromeos/dbus/cryptohome_client.cc.
 static const char kUserIdHashSuffix[] = "-hash";
 
 bool ShouldAddProfileDirPrefix(const std::string& user_id_hash) {
   // Do not add profile dir prefix for legacy profile dir and test
@@ skipping 159 matching lines @@
 }
 
 base::FilePath ProfileHelper::GetActiveUserProfileDir() {
   return ProfileHelper::GetUserProfileDir(active_user_id_hash_);
 }
 
 void ProfileHelper::Initialize() {
   user_manager::UserManager::Get()->AddSessionStateObserver(this);
 }
 
-void ProfileHelper::ClearSigninProfile(const base::Closure& on_clear_callback) {
-  on_clear_callbacks_.push_back(on_clear_callback);
+static bool ClearWebViewData(const base::Closure& on_clear_callback,
+                             content::WebContents* web_contents) {
+  extensions::GuestViewBase* guest_view =
+      extensions::GuestViewBase::FromWebContents(web_contents);
+  if (guest_view->GetViewType() == extensions::WebViewGuest::Type) {

[Fady Samuel, 2015/03/19 11:15:56]

This is unnecessarily complex. All of this can be done as the following:

extensions::WebViewGuest* guest =
extensions::WebViewGuest::FromWebContents(web_contents);
if (!guest)
  return false;

...

[Ivan Podogov, 2015/03/19 11:56:32]

This won't work: the WebContents that is passed here is the owner of the WebView
(not the contents of the WebView itself), so WebViewGuest::FromWebContents
returns nullptr.

[Fady Samuel, 2015/03/19 12:14:30]

I'm confused. GuestViewBase::FromWebContents does the same thing.

[Ivan Podogov, 2015/03/19 12:18:43]

Ah, I thought you were talking about replacing the whole ForEachGuest construct!
My bad.

[Ivan Podogov, 2015/03/19 12:29:21]

Done.

+    extensions::WebViewGuest* view_guest =
+        static_cast<extensions::WebViewGuest*>(guest_view);
+    view_guest->ClearData(base::Time(),
+                          content::StoragePartition::REMOVE_DATA_MASK_ALL,
+                          on_clear_callback);
+    return true;
+  }
+  return false;
+}
+
+static void ClearContentsData(content::WebContents* web_contents,
+                              const base::Closure& on_clear_callback) {
+  content::BrowserContext* context = web_contents->GetBrowserContext();
+  extensions::GuestViewManager* manager =
+      extensions::GuestViewManager::FromBrowserContext(context);
+  if (!manager->ForEachGuest(
+          web_contents, base::Bind(&ClearWebViewData, on_clear_callback))) {
+    on_clear_callback.Run();
+  }
+}
+
+void ProfileHelper::ClearSigninProfile(const base::Closure& on_clear_callback,
+                                       content::WebContents* webview_contents) {
+  on_clear_callbacks_.push_back(
+      webview_contents
+          ? base::Bind(&ClearContentsData, webview_contents, on_clear_callback)
+          : on_clear_callback);
   if (signin_profile_clear_requested_)
     return;
   ProfileManager* profile_manager = g_browser_process->profile_manager();
   // Check if signin profile was loaded.
   if (!profile_manager->GetProfileByPath(GetSigninProfileDir())) {
     OnBrowsingDataRemoverDone();
     return;
   }
   signin_profile_clear_requested_ = true;
   BrowsingDataRemover* remover =
@@ skipping 131 matching lines @@
 void ProfileHelper::OnSessionRestoreStateChanged(
     Profile* user_profile,
     OAuth2LoginManager::SessionRestoreState state) {
   if (state == OAuth2LoginManager::SESSION_RESTORE_DONE ||
       state == OAuth2LoginManager::SESSION_RESTORE_FAILED ||
       state == OAuth2LoginManager::SESSION_RESTORE_CONNECTION_FAILED) {
     chromeos::OAuth2LoginManager* login_manager =
         chromeos::OAuth2LoginManagerFactory::GetInstance()->
             GetForProfile(user_profile);
     login_manager->RemoveObserver(this);
-    ClearSigninProfile(base::Closure());
+    ClearSigninProfile(base::Closure(), nullptr);
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // ProfileHelper, UserManager::UserSessionStateObserver implementation:
 
 void ProfileHelper::ActiveUserHashChanged(const std::string& hash) {
   active_user_id_hash_ = hash;
 }
 
@@ skipping 19 matching lines @@
   user_to_profile_for_testing_[user] = profile;
 }
 
 // static
 std::string ProfileHelper::GetUserIdHashByUserIdForTesting(
     const std::string& user_id) {
   return user_id + kUserIdHashSuffix;
 }
 
 }  // namespace chromeos