summaryrefslogtreecommitdiffstats
path: root/chrome_frame
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 11:55:26 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-11 11:55:26 +0000
commit0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37 (patch)
treeb6803b94d704e6986642e36da11532eecffceb9d /chrome_frame
parenta2e6df2c24bd6ecfcd95a0cda680a27a3403bec7 (diff)
downloadchromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.zip
chromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.tar.gz
chromium_src-0c7d74fa3286ec04c080a2ffdc5d015c10fe7c37.tar.bz2
Rename ChromeThread to BrowserThread Part16:
- Rename entries starting from shell_integration.cc. More 30 files covered. BUG=56926 TEST=trybots Review URL: http://codereview.chromium.org/3708001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62136 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r--chrome_frame/test/net/fake_external_tab.cc6
-rw-r--r--chrome_frame/test/net/fake_external_tab.h2
2 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 867f156..f81c211 100644
--- a/chrome_frame/test/net/fake_external_tab.cc
+++ b/chrome_frame/test/net/fake_external_tab.cc
@@ -252,9 +252,9 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv)
: NetTestSuite(argc, argv),
chrome_frame_html_("/chrome_frame", kChromeFrameHtml) {
// Register the main thread by instantiating it, but don't call any methods.
- main_thread_.reset(new ChromeThread(ChromeThread::UI,
- MessageLoop::current()));
- DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
+ main_thread_.reset(new BrowserThread(BrowserThread::UI,
+ MessageLoop::current()));
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
fake_chrome_.Initialize();
pss_subclass_.reset(new ProcessSingletonSubclass(this));
EXPECT_TRUE(pss_subclass_->Subclass(fake_chrome_.user_data()));
diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h
index b66dfa4..cad24fc 100644
--- a/chrome_frame/test/net/fake_external_tab.h
+++ b/chrome_frame/test/net/fake_external_tab.h
@@ -96,7 +96,7 @@ class CFUrlRequestUnittestRunner
// on the main thread.
FakeExternalTab fake_chrome_;
scoped_ptr<ProcessSingletonSubclass> pss_subclass_;
- scoped_ptr<ChromeThread> main_thread_;
+ scoped_ptr<BrowserThread> main_thread_;
};
#endif // CHROME_FRAME_TEST_NET_FAKE_EXTERNAL_TAB_H_