summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/app_background_page_apitest.cc
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 02:34:45 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-07-20 02:34:45 +0000
commita7fe9110edf7ad578f19655e6d86030cc01e53e2 (patch)
tree6810038b3bb6f2d04904406c4a40c2f3e62c15e4 /chrome/browser/extensions/app_background_page_apitest.cc
parentd5b2197037aac358c1ac7c747e2761e1562a584b (diff)
downloadchromium_src-a7fe9110edf7ad578f19655e6d86030cc01e53e2.zip
chromium_src-a7fe9110edf7ad578f19655e6d86030cc01e53e2.tar.gz
chromium_src-a7fe9110edf7ad578f19655e6d86030cc01e53e2.tar.bz2
Create content\public\test\test_utils.h to hold common test classes that are used by unit and browser tests. unit tests shouldn't be including ui_test_utils.h.
BUG=90448 Review URL: https://chromiumcodereview.appspot.com/10807047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147602 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions/app_background_page_apitest.cc')
-rw-r--r--chrome/browser/extensions/app_background_page_apitest.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc
index e397b5c..a052e72 100644
--- a/chrome/browser/extensions/app_background_page_apitest.cc
+++ b/chrome/browser/extensions/app_background_page_apitest.cc
@@ -15,9 +15,9 @@
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/common/extensions/extension.h"
-#include "chrome/test/base/ui_test_utils.h"
#include "content/public/browser/notification_service.h"
#include "content/public/test/test_notification_tracker.h"
+#include "content/public/test/test_utils.h"
#include "net/base/mock_host_resolver.h"
using extensions::Extension;
@@ -68,7 +68,7 @@ class AppBackgroundPageApiTest : public ExtensionApiTest {
// We are not currently in the expected state - wait for the state to
// change.
- ui_test_utils::WindowedNotificationObserver watcher(
+ content::WindowedNotificationObserver watcher(
chrome::NOTIFICATION_BACKGROUND_MODE_CHANGED,
content::NotificationService::AllSources());
watcher.Wait();