diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 11:29:39 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-02 11:29:39 +0000 |
| commit | 631bb742a2798549af691af7357236ce0899b4cb (patch) | |
| tree | 1852356dc787a9c65e892ea1a57dfc03595d2bb4 /chrome_frame | |
| parent | e301da283ab61ff78a108d5ed3246d8b09614ef2 (diff) | |
| download | chromium_src-631bb742a2798549af691af7357236ce0899b4cb.zip chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.gz chromium_src-631bb742a2798549af691af7357236ce0899b4cb.tar.bz2 | |
Move BrowserThread to content namespace.
TBR=owners
BUG=98716
Review URL: http://codereview.chromium.org/8437002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108270 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 | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 7129c91..a454435 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -55,6 +55,8 @@ #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" +using content::BrowserThread; + namespace { // A special command line switch to allow developers to manually launch the @@ -304,8 +306,8 @@ CFUrlRequestUnittestRunner::CFUrlRequestUnittestRunner(int argc, char** argv) registrar_(chrome_frame_test::GetTestBedType()), test_result_(0) { // Register the main thread by instantiating it, but don't call any methods. - main_thread_.reset(new DeprecatedBrowserThread(BrowserThread::UI, - MessageLoop::current())); + main_thread_.reset(new content::DeprecatedBrowserThread( + BrowserThread::UI, MessageLoop::current())); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); fake_chrome_.Initialize(); pss_subclass_.reset(new ProcessSingletonSubclass(this)); diff --git a/chrome_frame/test/net/fake_external_tab.h b/chrome_frame/test/net/fake_external_tab.h index ea72a7b..756e8f8 100644 --- a/chrome_frame/test/net/fake_external_tab.h +++ b/chrome_frame/test/net/fake_external_tab.h @@ -105,7 +105,7 @@ class CFUrlRequestUnittestRunner // on the main thread. FakeExternalTab fake_chrome_; scoped_ptr<ProcessSingletonSubclass> pss_subclass_; - scoped_ptr<DeprecatedBrowserThread> main_thread_; + scoped_ptr<content::DeprecatedBrowserThread> main_thread_; ScopedChromeFrameRegistrar registrar_; int test_result_; }; |