diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 18:04:54 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-24 18:04:54 +0000 |
| commit | 6dbb699eada8156876ef8e44e487f29ef594971a (patch) | |
| tree | e51c88d0ecf22a4d1f5eeef430d8933ae7e7c55e /chrome/browser/extensions/extension_apitest.h | |
| parent | 559c26ae75b6e3facb10ff9dbdcd075a21c07246 (diff) | |
| download | chromium_src-6dbb699eada8156876ef8e44e487f29ef594971a.zip chromium_src-6dbb699eada8156876ef8e44e487f29ef594971a.tar.gz chromium_src-6dbb699eada8156876ef8e44e487f29ef594971a.tar.bz2 | |
Move TestWebSocketServer from ui_test_utils.h to browser_test_utils.h since it'll be used by worker_browsertest.cc inside content_browsertests.
BUG=90448
Review URL: https://chromiumcodereview.appspot.com/10796110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148139 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/extension_apitest.h')
| -rw-r--r-- | chrome/browser/extensions/extension_apitest.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h index 92a3298..9d3277a 100644 --- a/chrome/browser/extensions/extension_apitest.h +++ b/chrome/browser/extensions/extension_apitest.h @@ -15,13 +15,14 @@ class FilePath; +namespace content { +class TestWebSocketServer; +} + namespace extensions { class Extension; } -namespace ui_test_utils { -class TestWebSocketServer; -} // The general flow of these API tests should work like this: // (1) Setup initial browser state (e.g. create some bookmarks for the @@ -169,7 +170,7 @@ class ExtensionApiTest : public ExtensionBrowserTest { scoped_ptr<DictionaryValue> test_config_; // Hold the test WebSocket server. - scoped_ptr<ui_test_utils::TestWebSocketServer> websocket_server_; + scoped_ptr<content::TestWebSocketServer> websocket_server_; }; // PlatformAppApiTest sets up the command-line flags necessary for platform |