diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 14:00:36 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-28 14:00:36 +0000 |
| commit | 14f79fec5f13a623f837f0b9438556180e5e7896 (patch) | |
| tree | f86cadba8422d4a453acc22792406ff2b2cb8da8 /chrome/tools/profiles | |
| parent | f8a7f81d377eb872c2c9760813966920810edfb3 (diff) | |
| download | chromium_src-14f79fec5f13a623f837f0b9438556180e5e7896.zip chromium_src-14f79fec5f13a623f837f0b9438556180e5e7896.tar.gz chromium_src-14f79fec5f13a623f837f0b9438556180e5e7896.tar.bz2 | |
Revert 111695 - Have content/ create and destroy its own threads.
Reason: Problems on official builders.
Change embedding API and embedders to allow for this.
Push inheritance of base::Thread down to content::BrowserThreadImpl so
that content::BrowserThread is just a namespace for API functions.
This change temporarily disables chrome_frame_net_tests as agreed by the CF lead, see bug 105435.
TBR=ben@chromium.org (IWYU change only)
BUG=98716,104578,105435
Review URL: http://codereview.chromium.org/8477004
TBR=joi@chromium.org
Review URL: http://codereview.chromium.org/8718012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/tools/profiles')
| -rw-r--r-- | chrome/tools/profiles/generate_profile.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/chrome/tools/profiles/generate_profile.cc b/chrome/tools/profiles/generate_profile.cc index 51c0f9c..adebcd9 100644 --- a/chrome/tools/profiles/generate_profile.cc +++ b/chrome/tools/profiles/generate_profile.cc @@ -23,7 +23,6 @@ #include "chrome/common/chrome_paths.h" #include "chrome/common/thumbnail_score.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/browser_thread_impl.h" #include "content/browser/notification_service_impl.h" #include "content/public/browser/browser_thread.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -237,8 +236,8 @@ int main(int argc, const char* argv[]) { ResourceBundle::InitSharedInstance("en-US"); NotificationServiceImpl notification_service; MessageLoopForUI message_loop; - content::BrowserThreadImpl ui_thread(BrowserThread::UI, &message_loop); - content::BrowserThreadImpl db_thread(BrowserThread::DB, &message_loop); + content::DeprecatedBrowserThread ui_thread(BrowserThread::UI, &message_loop); + content::DeprecatedBrowserThread db_thread(BrowserThread::DB, &message_loop); TestingProfile profile; profile.CreateHistoryService(false, false); if (types & TOP_SITES) { |