diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-06 18:46:35 +0000 |
| commit | 9e49959b0e6e940c39359f5f05f9d5da6032a869 (patch) | |
| tree | a1059820b0bf8129bcf571966891ce122453465e /chrome_frame | |
| parent | 4a8e0f3d4b33c1b69021575d7b971da7b17340ae (diff) | |
| download | chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.zip chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.gz chromium_src-9e49959b0e6e940c39359f5f05f9d5da6032a869.tar.bz2 | |
Revert "Support sharing of ContentMain and BrowserMain code with embedded use cases."
This reverts commit r120574. Test failures.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120581 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 6 | ||||
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.h | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 5a7a0af..d81a2a2 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -49,7 +49,7 @@ #include "chrome_frame/test/simulate_input.h" #include "chrome_frame/test/win_event_receiver.h" #include "chrome_frame/utils.h" -#include "content/public/app/content_main.h" +#include "content/app/content_main.h" #include "content/public/app/startup_helper_win.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_service.h" @@ -613,10 +613,6 @@ void CFUrlRequestUnittestRunner::PreEarlyInitialization() { FilterDisabledTests(); } -MessageLoop* CFUrlRequestUnittestRunner::GetMainMessageLoop() { - return NULL; -} - int CFUrlRequestUnittestRunner::PreCreateThreads() { fake_chrome_.reset(new FakeExternalTab()); fake_chrome_->Initialize(); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index d7e726c7..0ed4f78 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -102,7 +102,6 @@ class CFUrlRequestUnittestRunner virtual void PreEarlyInitialization() OVERRIDE; virtual void PostEarlyInitialization() OVERRIDE {} virtual void PreMainMessageLoopStart() OVERRIDE {} - virtual MessageLoop* GetMainMessageLoop() OVERRIDE; virtual void PostMainMessageLoopStart() OVERRIDE {} virtual void ToolkitInitialized() OVERRIDE {} virtual int PreCreateThreads() OVERRIDE; |