Reverts debugging code added for 91396. I've tracked down the bug and

chrome/browser/ui/views/chrome_views_delegate.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/ui/views/chrome_views_delegate.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
-#include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/accessibility_event_router_views.h"
 #include "chrome/browser/ui/views/event_utils.h"
 #include "chrome/browser/ui/window_sizer.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/gfx/rect.h"
 #include "views/widget/native_widget.h"
 #include "views/widget/widget.h"
 
 #if defined(OS_WIN)
 #include "chrome/browser/app_icon_win.h"
 #endif
 
 namespace {
 
 // If the given window has a profile associated with it, use that profile's
 // preference service. Otherwise, store and retrieve the data from Local State.
 // This function may return NULL if the necessary pref service has not yet
 // been initialized.
 // TODO(mirandac): This function will also separate windows by profile in a
 // multi-profile environment.
-PrefService* GetPrefsForWindow(const views::Widget* window,
-                               bool* using_local_state) {
+PrefService* GetPrefsForWindow(const views::Widget* window) {
   Profile* profile = reinterpret_cast<Profile*>(
       window->GetNativeWindowProperty(Profile::kProfileKey));
   if (!profile) {
     // Use local state for windows that have no explicit profile.
-    *using_local_state = true;
     return g_browser_process->local_state();
   }
-  *using_local_state = false;
   return profile->GetPrefs();
 }
 
 }  // namespace
 
 // static
 views::View* ChromeViewsDelegate::default_parent_view = NULL;
 
 ///////////////////////////////////////////////////////////////////////////////
 // ChromeViewsDelegate, views::ViewsDelegate implementation:
 
 ui::Clipboard* ChromeViewsDelegate::GetClipboard() const {
   return g_browser_process->clipboard();
 }
 
 views::View* ChromeViewsDelegate::GetDefaultParentView() {
   return default_parent_view;
 }
 
 void ChromeViewsDelegate::SaveWindowPlacement(const views::Widget* window,
                                               const std::wstring& window_name,
                                               const gfx::Rect& bounds,
                                               bool maximized) {
-  bool using_local_state = false;
-  PrefService* prefs = GetPrefsForWindow(window, &using_local_state);
+  PrefService* prefs = GetPrefsForWindow(window);
   if (!prefs)
     return;
 
-  CHECK(prefs->FindPreference(WideToUTF8(window_name).c_str())) << " " <<
-      browser_shutdown::GetShutdownType() << " " << using_local_state << " " <<
-      window->destroy_state();
+  DCHECK(prefs->FindPreference(WideToUTF8(window_name).c_str()));
   DictionaryPrefUpdate update(prefs, WideToUTF8(window_name).c_str());
   DictionaryValue* window_preferences = update.Get();
   window_preferences->SetInteger("left", bounds.x());
   window_preferences->SetInteger("top", bounds.y());
   window_preferences->SetInteger("right", bounds.right());
   window_preferences->SetInteger("bottom", bounds.bottom());
   window_preferences->SetBoolean("maximized", maximized);
 
   scoped_ptr<WindowSizer::MonitorInfoProvider> monitor_info_provider(
       WindowSizer::CreateDefaultMonitorInfoProvider());
@@ skipping 66 matching lines @@
   g_browser_process->AddRefModule();
 }
 
 void ChromeViewsDelegate::ReleaseRef() {
   g_browser_process->ReleaseModule();
 }
 
 int ChromeViewsDelegate::GetDispositionForEvent(int event_flags) {
   return event_utils::DispositionFromEventFlags(event_flags);
 }