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

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

Issue 823133004: Cleanup: Update the path to gfx rect headers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rect_f.h Created 5 years, 11 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 "base/files/file_util.h" 6 #include "base/files/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" 15 #include "content/public/test/content_browser_test.h"
16 #include "content/public/test/content_browser_test_utils.h" 16 #include "content/public/test/content_browser_test_utils.h"
17 #include "content/public/test/test_utils.h" 17 #include "content/public/test/test_utils.h"
18 #include "content/shell/browser/shell.h" 18 #include "content/shell/browser/shell.h"
19 #include "content/shell/common/shell_switches.h" 19 #include "content/shell/common/shell_switches.h"
20 #include "net/test/embedded_test_server/embedded_test_server.h" 20 #include "net/test/embedded_test_server/embedded_test_server.h"
21 #include "net/test/url_request/url_request_mock_http_job.h" 21 #include "net/test/url_request/url_request_mock_http_job.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/geometry/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
30 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64) 30 #if defined(OS_WIN) && defined(ARCH_CPU_X86_64)
31 #define MAYBE(x) DISABLED_##x 31 #define MAYBE(x) DISABLED_##x
32 #else 32 #else
33 #define MAYBE(x) x 33 #define MAYBE(x) x
(...skipping 523 matching lines...) Expand 10 before | Expand all | Expand 10 after
557 ResourceDispatcherHostDelegate* old_delegate = 557 ResourceDispatcherHostDelegate* old_delegate =
558 ResourceDispatcherHostImpl::Get()->delegate(); 558 ResourceDispatcherHostImpl::Get()->delegate();
559 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate); 559 ResourceDispatcherHostImpl::Get()->SetDelegate(&test_delegate);
560 LoadAndWait(url); 560 LoadAndWait(url);
561 test_delegate.WaitForPluginRequest(); 561 test_delegate.WaitForPluginRequest();
562 ASSERT_TRUE(test_delegate.found_cookie()); 562 ASSERT_TRUE(test_delegate.found_cookie());
563 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate); 563 ResourceDispatcherHostImpl::Get()->SetDelegate(old_delegate);
564 } 564 }
565 565
566 } // namespace content 566 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/media/capture/content_video_capture_device_core.cc ('k') | content/browser/plugin_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698