summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authormichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 00:57:39 +0000
committermichaeln@google.com <michaeln@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-20 00:57:39 +0000
commit5af15b4961481876c87f5a32e0f50df8e7d060ce (patch)
tree12a79f7ad5d948f7bfa50a3dc7e05220ced4edac /chrome_frame
parentdb4fd48ab5672dd485f8510a69d495bbb327fc4d (diff)
downloadchromium_src-5af15b4961481876c87f5a32e0f50df8e7d060ce.zip
chromium_src-5af15b4961481876c87f5a32e0f50df8e7d060ce.tar.gz
chromium_src-5af15b4961481876c87f5a32e0f50df8e7d060ce.tar.bz2
Get chrome:// dev tool urls hooked up in content_shell.
Review URL: https://chromiumcodereview.appspot.com/9950040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133107 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc
index 0655ede..aa2b516 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -145,10 +145,7 @@ class FakeMainDelegate : public content::ContentMainDelegate {
virtual bool BasicStartupComplete(int* exit_code) OVERRIDE {
logging_win::InstallTestLogCollector(
testing::UnitTest::GetInstance());
- return false;
- }
- virtual void PreSandboxStartup() OVERRIDE {
// Initialize the content client.
content::SetContentClient(&g_chrome_content_client.Get());
@@ -157,8 +154,11 @@ class FakeMainDelegate : public content::ContentMainDelegate {
// FakeContentBrowserClient, to override CreateBrowserMainParts. Must
// be done before any tabs are created.
content::GetContentClient()->set_browser(&g_browser_client.Get());
-
content::GetContentClient()->set_renderer(&g_renderer_client.Get());
+ return false;
+ }
+
+ virtual void PreSandboxStartup() OVERRIDE {
}
virtual void SandboxInitialized(const std::string& process_type) OVERRIDE {}