Resolve new GAIA flow's infinite loop.

chrome/browser/chromeos/profiles/profile_helper.cc

Index: chrome/browser/chromeos/profiles/profile_helper.cc
diff --git a/chrome/browser/chromeos/profiles/profile_helper.cc b/chrome/browser/chromeos/profiles/profile_helper.cc
index 7e69cc750886fc814ae7e2e144f78d17462ec4ef..c263e22f9432bf5338b84c9e58c4784a4d7103f0 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.cc
+++ b/chrome/browser/chromeos/profiles/profile_helper.cc
@@ -18,6 +18,10 @@
 #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_manager.h"
+#include "extensions/browser/guest_view/web_view/web_view_guest.h"
 
 namespace chromeos {
 
@@ -197,8 +201,36 @@ 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,

[Roman Sorokin (ftl), 2015/03/19 13:15:40]

Why these functions are static? Please move to anonymous namespace.

[Ivan Podogov, 2015/03/19 13:25:37]

Done.

+                             content::WebContents* web_contents) {
+  extensions::WebViewGuest* view_guest =
+      extensions::WebViewGuest::FromWebContents(web_contents);
+  if (view_guest) {
+    view_guest->ClearData(base::Time(),
+                          content::StoragePartition::REMOVE_DATA_MASK_ALL,
+                          on_clear_callback);
+    return true;

[Roman Sorokin (ftl), 2015/03/19 13:15:40]

Why we don't return value returned by ClearData?

[Ivan Podogov, 2015/03/19 13:25:37]

Done.

+  }
+  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();
@@ -350,7 +382,7 @@ void ProfileHelper::OnSessionRestoreStateChanged(
         chromeos::OAuth2LoginManagerFactory::GetInstance()->
             GetForProfile(user_profile);
     login_manager->RemoveObserver(this);
-    ClearSigninProfile(base::Closure());
+    ClearSigninProfile(base::Closure(), nullptr);
   }
 }