Moved theme related state from BrowserInstantController to InstantService.

chrome/browser/ui/browser.cc

 // Copyright 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 "chrome/browser/ui/browser.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 #endif  // defined(OS_WIN)
@@ skipping 464 matching lines @@
 #endif
 
   profile_pref_registrar_.RemoveAll();
 
   encoding_auto_detect_.Destroy();
 
   // Destroy BrowserExtensionWindowController before the incognito profile
   // is destroyed to make sure the chrome.windows.onRemoved event is sent.
   extension_window_controller_.reset();
 
+  // Destroy BrowserInstantController before the incongnito profile is destroyed
+  // because the InstantController destructor depends on this profile.
+  instant_controller_.reset();

[Peter Kasting, 2013/06/21 02:33:30]

Check with erg/rlp on whether there's a better way to indicate this dependency
within your class itself.  (Maybe we should make the instant controller a
profile-keyed service or something.)

[kmadhusu, 2013/06/21 02:49:39]

rlp@: Is there any better way to indicate this dependency?

[rpetterson, 2013/06/21 06:19:06]

Are BrowserInstantControllers per profile or per browser? If it's the former,
then yes, it should be a browser_context keyed service. If not, then this is
probably the appropriate place for this.

[kmadhusu, 2013/06/21 15:45:45]

BrowserInstantController is instantiated per browser and not per profile.

+
   if (profile_->IsOffTheRecord() &&
       !BrowserList::IsOffTheRecordSessionActiveForProfile(profile_)) {
     // An incognito profile is no longer needed, this indirectly frees
     // its cache and cookies once it gets destroyed at the appropriate time.
     ProfileDestroyer::DestroyProfileWhenAppropriate(profile_);
   }
 
   // There may be pending file dialogs, we need to tell them that we've gone
   // away so they don't try and call back to us.
   if (select_file_dialog_.get())
@@ skipping 1716 matching lines @@
   if (contents && !allow_js_access) {
     contents->web_contents()->GetController().LoadURL(
         target_url,
         content::Referrer(),
         content::PAGE_TRANSITION_LINK,
         std::string());  // No extra headers.
   }
 
   return contents != NULL;
 }