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

Side by Side Diff: content/browser/plugin_browsertest.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | Annotate | Revision Log
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 "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/path_service.h" 7 #include "base/path_service.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "content/public/browser/browser_thread.h" 9 #include "content/public/browser/browser_thread.h"
10 #include "content/public/common/content_switches.h" 10 #include "content/public/common/content_switches.h"
11 #include "content/public/test/browser_test_utils.h" 11 #include "content/public/test/browser_test_utils.h"
12 #include "content/shell/browser/shell.h"
12 #include "content/shell/common/shell_switches.h" 13 #include "content/shell/common/shell_switches.h"
13 #include "content/shell/shell.h"
14 #include "content/test/content_browser_test.h" 14 #include "content/test/content_browser_test.h"
15 #include "content/test/content_browser_test_utils.h" 15 #include "content/test/content_browser_test_utils.h"
16 #include "content/test/net/url_request_mock_http_job.h" 16 #include "content/test/net/url_request_mock_http_job.h"
17 #include "ui/gfx/rect.h" 17 #include "ui/gfx/rect.h"
18 18
19 #if defined(OS_WIN) 19 #if defined(OS_WIN)
20 #include "base/win/registry.h" 20 #include "base/win/registry.h"
21 #endif 21 #endif
22 22
23 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861 23 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) { 453 IN_PROC_BROWSER_TEST_F(PluginTest, DISABLED_Java) {
454 TestPlugin("Java.html"); 454 TestPlugin("Java.html");
455 } 455 }
456 456
457 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) { 457 IN_PROC_BROWSER_TEST_F(PluginTest, MAYBE(Silverlight)) {
458 TestPlugin("silverlight.html"); 458 TestPlugin("silverlight.html");
459 } 459 }
460 #endif // defined(OS_WIN) 460 #endif // defined(OS_WIN)
461 461
462 } // namespace content 462 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_internals_browsertest.cc ('k') | content/browser/plugin_data_remover_impl_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698