Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(168)

Side by Side Diff: chrome/browser/apps/app_window_browsertest.cc

Issue 584513003: Move extension_test_message_listener to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/apps/app_browsertest_util.h" 5 #include "chrome/browser/apps/app_browsertest_util.h"
6 #include "chrome/browser/extensions/extension_test_message_listener.h"
7 #include "chrome/browser/profiles/profile.h" 6 #include "chrome/browser/profiles/profile.h"
8 #include "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
9 #include "chrome/browser/ui/extensions/application_launch.h" 8 #include "chrome/browser/ui/extensions/application_launch.h"
10 #include "content/public/browser/notification_service.h" 9 #include "content/public/browser/notification_service.h"
11 #include "content/public/test/test_utils.h" 10 #include "content/public/test/test_utils.h"
12 #include "extensions/browser/app_window/app_window_geometry_cache.h" 11 #include "extensions/browser/app_window/app_window_geometry_cache.h"
13 #include "extensions/common/constants.h" 12 #include "extensions/common/constants.h"
14 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
14 #include "extensions/test/extension_test_message_listener.h"
15 #include "extensions/test/result_catcher.h" 15 #include "extensions/test/result_catcher.h"
16 16
17 using extensions::AppWindowGeometryCache; 17 using extensions::AppWindowGeometryCache;
18 using extensions::ResultCatcher; 18 using extensions::ResultCatcher;
19 19
20 // This helper class can be used to wait for changes in the app window 20 // This helper class can be used to wait for changes in the app window
21 // geometry cache registry for a specific window in a specific extension. 21 // geometry cache registry for a specific window in a specific extension.
22 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer { 22 class GeometryCacheChangeHelper : AppWindowGeometryCache::Observer {
23 public: 23 public:
24 GeometryCacheChangeHelper(AppWindowGeometryCache* cache, 24 GeometryCacheChangeHelper(AppWindowGeometryCache* cache,
(...skipping 233 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE); 258 extensions::ScopedCurrentChannel channel(chrome::VersionInfo::CHANNEL_STABLE);
259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_; 259 ASSERT_TRUE(RunAppWindowAPITest("testFrameColors")) << message_;
260 } 260 }
261 #endif 261 #endif
262 262
263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) { 263 IN_PROC_BROWSER_TEST_F(AppWindowAPITest, TestVisibleOnAllWorkspaces) {
264 ASSERT_TRUE( 264 ASSERT_TRUE(
265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces")) 265 RunAppWindowAPITestAndWaitForRoundTrip("testVisibleOnAllWorkspaces"))
266 << message_; 266 << message_;
267 } 267 }
OLDNEW
« no previous file with comments | « chrome/browser/apps/app_view_browsertest.cc ('k') | chrome/browser/apps/app_window_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698