Fail gracefully if InitializeResourceContext ends up calling itself recursively.

Fail gracefully if InitializeResourceContext ends up calling itself recursively.

BUG=None
TEST=chrome_frame_net_tests don't crash at shutdown (Note, they currently crash at startup or simply don't run without a few other patches applied - this fixes one of the crashes!).


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=123492

[erikwright (departed), 2012-02-23 22:15:59]

Hi John,

As per our discussion. Note that this will not solve the issues with those other
GetX functions. Not sure if you want to solve that by using a string-based map
or what.

Thanks,

Erik

https://chromiumcodereview.appspot.com/9443033/diff/1/content/browser/browser...
File content/browser/browser_context.cc (right):

https://chromiumcodereview.appspot.com/9443033/diff/1/content/browser/browser...
content/browser/browser_context.cc:23: // Key names on BrowserContext.
Note that these keys are sent to SupportsUserData::GetUserData where they are
compared (by pointer) to keys defined in resource_context_impl.cc. While some
linkers might cause these to have the same value, this is not what happens in my
development build. Therefore the below calls to GetUserData will all return NULL
even if the desired data is in fact stored.

[jam, 2012-02-23 23:11:36]

lgtm, thanks

http://codereview.chromium.org/9443033/diff/1/content/browser/browser_context.cc
File content/browser/browser_context.cc (right):

http://codereview.chromium.org/9443033/diff/1/content/browser/browser_context...
content/browser/browser_context.cc:23: // Key names on BrowserContext.
On 2012/02/23 22:16:00, erikwright wrote:
> Note that these keys are sent to SupportsUserData::GetUserData where they are
> compared (by pointer) to keys defined in resource_context_impl.cc. While some
> linkers might cause these to have the same value, this is not what happens in
my
> development build. Therefore the below calls to GetUserData will all return
NULL
> even if the desired data is in fact stored.

these aren't meant to be shared. the map on ResourceContext is different from
the map on BrowserContext.

http://codereview.chromium.org/9443033/diff/1/content/browser/resource_contex...
File content/browser/resource_context_impl.cc (right):

http://codereview.chromium.org/9443033/diff/1/content/browser/resource_contex...
content/browser/resource_context_impl.cc:82: void
InitializeResourceContext(BrowserContext* browser_context) {
nit: perhaps rename this to EnsureResourceContextInitialized since that better
reflects its job now

[commit-bot: I haz the power, 2012-02-24 15:43:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/erikwright@chromium.org/9443033/5001

[commit-bot: I haz the power, 2012-02-24 17:08:25]

Change committed as 123492