diff options
| author | marshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:48:52 +0000 |
|---|---|---|
| committer | marshall@chromium.org <marshall@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 16:48:52 +0000 |
| commit | b1b33e512d3297f38d65833054ad9cf6a8408df7 (patch) | |
| tree | c913e2573c3d543492fd0cb9e609e1154813411a /chrome_frame | |
| parent | 1ab5b8cd4565b2e8d1f0282e09170d46dfd2b98d (diff) | |
| download | chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.zip chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.tar.gz chromium_src-b1b33e512d3297f38d65833054ad9cf6a8408df7.tar.bz2 | |
Revert 121236 - Support sharing of ContentMain and BrowserMain code with embedded use cases (try #2).
Tests failing.
Review URL: https://chromiumcodereview.appspot.com/9372027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121245 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; |