content/browser/plugin_browsertest.cc - Issue 214823006: Move ContentBrowserTest class to content/public, since it's used by components_browsertests for bro…

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

Issue 214823006: Move ContentBrowserTest class to content/public, since it's used by components_browsertests for bro… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: fix mac Created 6 years, 9 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

« chrome/test/mini_installer/variable_expander.py ('K') | « content/browser/media/webrtc_internals_browsertest.cc ('k') | content/browser/plugin_data_remover_impl_browsertest.cc » ('j') | content/child/child_thread.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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/string_util.h"	8 #include "base/strings/string_util.h"

9 #include "base/strings/utf_string_conversions.h"	9 #include "base/strings/utf_string_conversions.h"

10 #include "content/browser/loader/resource_dispatcher_host_impl.h"	10 #include "content/browser/loader/resource_dispatcher_host_impl.h"

11 #include "content/public/browser/browser_thread.h"	11 #include "content/public/browser/browser_thread.h"

12 #include "content/public/browser/resource_dispatcher_host_delegate.h"	12 #include "content/public/browser/resource_dispatcher_host_delegate.h"

13 #include "content/public/common/content_switches.h"	13 #include "content/public/common/content_switches.h"

14 #include "content/public/test/browser_test_utils.h"	14 #include "content/public/test/browser_test_utils.h"

	15 #include "content/public/test/content_browser_test.h"

	16 #include "content/public/test/content_browser_test_utils.h"

15 #include "content/public/test/test_utils.h"	17 #include "content/public/test/test_utils.h"

16 #include "content/shell/browser/shell.h"	18 #include "content/shell/browser/shell.h"

17 #include "content/shell/common/shell_switches.h"	19 #include "content/shell/common/shell_switches.h"

18 #include "content/test/content_browser_test.h"

19 #include "content/test/content_browser_test_utils.h"

20 #include "content/test/net/url_request_mock_http_job.h"	20 #include "content/test/net/url_request_mock_http_job.h"

21 #include "net/test/embedded_test_server/embedded_test_server.h"	21 #include "net/test/embedded_test_server/embedded_test_server.h"

22 #include "net/url_request/url_request.h"	22 #include "net/url_request/url_request.h"

23 #include "ui/gfx/rect.h"	23 #include "ui/gfx/rect.h"

24	24

25 #if defined(OS_WIN)	25 #if defined(OS_WIN)

26 #include "base/win/registry.h"	26 #include "base/win/registry.h"

27 #endif	27 #endif

28	28

29 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861	29 // TODO(jschuh): Finish plugins on Win64. crbug.com/180861

(...skipping 520 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
550 ResourceDispatcherHostDelegate* old_delegate =	550 ResourceDispatcherHostDelegate* old_delegate =

551 ResourceDispatcherHostImpl::Get()->delegate();	551 ResourceDispatcherHostImpl::Get()->delegate();

552 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);	552 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);

553 LoadAndWait(url);	553 LoadAndWait(url);

554 test_delegate.WaitForPluginRequest();	554 test_delegate.WaitForPluginRequest();

555 ASSERT_TRUE(test_delegate.found_cookie());	555 ASSERT_TRUE(test_delegate.found_cookie());

556 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);	556 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);

557 }	557 }

558	558

559 } // namespace content	559 } // namespace content

OLD	NEW