Revert 215745 "Fix crash when reloading packaged app. "

trunk/src/chrome/browser/extensions/shell_window_registry.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 "apps/shell_window.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/profiles/incognito_helpers.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/extensions/native_app_window.h"
@@ skipping 67 matching lines @@
 }
 
 void ShellWindowRegistry::ShellWindowActivated(ShellWindow* shell_window) {
   BringToFront(shell_window);
 }
 
 void ShellWindowRegistry::RemoveShellWindow(ShellWindow* shell_window) {
   const ShellWindowList::iterator it = std::find(shell_windows_.begin(),
                                                  shell_windows_.end(),
                                                  shell_window);
-  if (it != shell_windows_.end()) {
+  if (it != shell_windows_.end())
     shell_windows_.erase(it);
-    FOR_EACH_OBSERVER(Observer, observers_, OnShellWindowRemoved(shell_window));
-  }
+  FOR_EACH_OBSERVER(Observer, observers_, OnShellWindowRemoved(shell_window));
 }
 
 void ShellWindowRegistry::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void ShellWindowRegistry::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 196 matching lines @@
 bool ShellWindowRegistry::Factory::ServiceIsNULLWhileTesting() const {
   return false;
 }
 
 content::BrowserContext* ShellWindowRegistry::Factory::GetBrowserContextToUse(
     content::BrowserContext* context) const {
   return chrome::GetBrowserContextRedirectedInIncognito(context);
 }
 
 }  // namespace extensions