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

Side by Side Diff: chrome/browser/extensions/extension_commands_global_registry_apitest.cc

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/extensions/extension_apitest.h" 5 #include "chrome/browser/extensions/extension_apitest.h"
6 #include "chrome/browser/extensions/window_controller.h" 6 #include "chrome/browser/extensions/window_controller.h"
7 #include "chrome/browser/ui/browser_window.h" 7 #include "chrome/browser/ui/browser_window.h"
8 #include "chrome/browser/ui/tabs/tab_strip_model.h" 8 #include "chrome/browser/ui/tabs/tab_strip_model.h"
9 #include "chrome/test/base/interactive_test_utils.h" 9 #include "chrome/test/base/interactive_test_utils.h"
10 #include "content/public/test/browser_test_utils.h" 10 #include "content/public/test/browser_test_utils.h"
11 #include "extensions/test/result_catcher.h"
11 #include "ui/base/base_window.h" 12 #include "ui/base/base_window.h"
12 #include "ui/base/test/ui_controls.h" 13 #include "ui/base/test/ui_controls.h"
13 14
14 #if defined(OS_LINUX) 15 #if defined(OS_LINUX)
15 #include <X11/Xlib.h> 16 #include <X11/Xlib.h>
16 #include <X11/extensions/XTest.h> 17 #include <X11/extensions/XTest.h>
17 #include <X11/keysym.h> 18 #include <X11/keysym.h>
18 19
19 #include "ui/events/keycodes/keyboard_code_conversion_x.h" 20 #include "ui/events/keycodes/keyboard_code_conversion_x.h"
20 #include "ui/gfx/x/x11_types.h" 21 #include "ui/gfx/x/x11_types.h"
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 false, 196 false,
196 false, 197 false,
197 false); 198 false);
198 199
199 // We should get two success results. 200 // We should get two success results.
200 ASSERT_TRUE(catcher.GetNextResult()); 201 ASSERT_TRUE(catcher.GetNextResult());
201 ASSERT_TRUE(catcher.GetNextResult()); 202 ASSERT_TRUE(catcher.GetNextResult());
202 } 203 }
203 204
204 } // namespace extensions 205 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_bindings_apitest.cc ('k') | chrome/browser/extensions/extension_incognito_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698