Fix crash in SyncSetupWizard::IsVisible()

chrome/browser/extensions/extension_tabs_module.cc

 // Copyright (c) 2011 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/extensions/extension_tabs_module.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/base64.h"
@@ skipping 259 matching lines @@
       error_ = keys::kIncognitoModeIsForced;
       *is_error = true;
       return false;
     }
   } else if (incognito_availability == IncognitoModePrefs::FORCED) {
     // If incognito argument is not specified explicitly, we default to
     // incognito when forced so by policy.
     incognito = true;
   }
 
-  // If we are opening an incognito window.
-  if (incognito) {
+  // Remove all URLs that are not allowed in an incognito session. Note that a
+  // ChromeOS guest session is not considered incognito in this case.
+  if (incognito && !Profile::IsGuestSession()) {
     std::string first_url_erased;
-    // Guest session is an exception as it always opens in incognito mode.
     for (size_t i = 0; i < urls->size();) {
-      if (browser::IsURLAllowedInIncognito((*urls)[i]) &&
-          !Profile::IsGuestSession()) {
+      if (browser::IsURLAllowedInIncognito((*urls)[i])) {
+        i++;
+      } else {
         if (first_url_erased.empty())
           first_url_erased = (*urls)[i].spec();
         urls->erase(urls->begin() + i);
-      } else {
-        i++;
       }
     }
     if (urls->empty() && !first_url_erased.empty()) {
       error_ = ExtensionErrorUtils::FormatErrorMessage(
           keys::kURLsNotAllowedInIncognitoError, first_url_erased);
       *is_error = true;
       return false;
     }
   }
   return incognito;
@@ skipping 1267 matching lines @@
   // called for every API call the extension made.
   GotLanguage(language);
 }
 
 void DetectTabLanguageFunction::GotLanguage(const std::string& language) {
   result_.reset(Value::CreateStringValue(language.c_str()));
   SendResponse(true);
 
   Release();  // Balanced in Run()
 }