diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 22:57:24 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-14 22:57:24 +0000 |
| commit | a7cacd71939a3ac5fea1573143b91f35d3503875 (patch) | |
| tree | d67d15003daf863e6d602a930f1c63775bd6225f | |
| parent | 241632237dc0cd1343f9c8bafc92dd28252fb79f (diff) | |
| download | chromium_src-a7cacd71939a3ac5fea1573143b91f35d3503875.zip chromium_src-a7cacd71939a3ac5fea1573143b91f35d3503875.tar.gz chromium_src-a7cacd71939a3ac5fea1573143b91f35d3503875.tar.bz2 | |
Fixed a chrome frame net test crasher caused after the change in chrome to make the
ChromeContentBrowserClient pointer which is passed to the ContentClient object a scoped_ptr
We were passing a stack pointer which caused the net tests to crash at exit.
BUG=none
TEST=chrome frame net tests should run to completion.
TBR=amit
Review URL: http://codereview.chromium.org/6696003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78114 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index b1ecb28..24caed7 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -508,11 +508,10 @@ int main(int argc, char** argv) { // Initialize the content client which that code uses to talk to Chrome. chrome::ChromeContentClient chrome_content_client; content::SetContentClient(&chrome_content_client); - - chrome::ChromeContentBrowserClient content_browser_client; // Override the default ContentBrowserClient to let Chrome participate in // content logic. Must be done before any tabs are created. - content::GetContentClient()->set_browser_client(&content_browser_client); + content::GetContentClient()->set_browser_client( + new chrome::ChromeContentBrowserClient); // TODO(tommi): Stuff be broke. Needs a fixin'. // This is awkward: the TestSuite derived CFUrlRequestUnittestRunner contains |