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

Side by Side Diff: chrome/browser/extensions/api/web_request/web_request_apitest.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "base/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/browser/chrome_notification_types.h" 6 #include "chrome/browser/chrome_notification_types.h"
7 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 7 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_service.h" 9 #include "chrome/browser/extensions/extension_service.h"
10 #include "chrome/browser/extensions/extension_test_message_listener.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/login/login_prompt.h" 12 #include "chrome/browser/ui/login/login_prompt.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
16 #include "content/public/browser/notification_registrar.h" 15 #include "content/public/browser/notification_registrar.h"
17 #include "content/public/browser/notification_service.h" 16 #include "content/public/browser/notification_service.h"
18 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
20 #include "content/public/test/browser_test_utils.h" 19 #include "content/public/test/browser_test_utils.h"
21 #include "extensions/browser/extension_system.h" 20 #include "extensions/browser/extension_system.h"
22 #include "extensions/common/features/feature.h" 21 #include "extensions/common/features/feature.h"
22 #include "extensions/test/extension_test_message_listener.h"
23 #include "extensions/test/result_catcher.h" 23 #include "extensions/test/result_catcher.h"
24 #include "net/dns/mock_host_resolver.h" 24 #include "net/dns/mock_host_resolver.h"
25 #include "net/test/embedded_test_server/embedded_test_server.h" 25 #include "net/test/embedded_test_server/embedded_test_server.h"
26 #include "third_party/WebKit/public/web/WebInputEvent.h" 26 #include "third_party/WebKit/public/web/WebInputEvent.h"
27 27
28 using content::WebContents; 28 using content::WebContents;
29 using extensions::Feature; 29 using extensions::Feature;
30 using extensions::ResultCatcher; 30 using extensions::ResultCatcher;
31 31
32 namespace { 32 namespace {
(...skipping 282 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 // Reload extension and wait for rules to be set up again. This should not 315 // Reload extension and wait for rules to be set up again. This should not
316 // crash the browser. 316 // crash the browser.
317 ExtensionTestMessageListener listener2("done", true); 317 ExtensionTestMessageListener listener2("done", true);
318 ExtensionTestMessageListener listener_incognito2("done_incognito", true); 318 ExtensionTestMessageListener listener_incognito2("done_incognito", true);
319 319
320 ReloadExtension(extension->id()); 320 ReloadExtension(extension->id());
321 321
322 EXPECT_TRUE(listener2.WaitUntilSatisfied()); 322 EXPECT_TRUE(listener2.WaitUntilSatisfied());
323 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied()); 323 EXPECT_TRUE(listener_incognito2.WaitUntilSatisfied());
324 } 324 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698