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

Side by Side Diff: chrome_frame/test/net/fake_external_tab.cc

Issue 8336007: Move content_client.h into content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add back a needed include. Created 9 years, 2 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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_frame/test/net/fake_external_tab.h" 5 #include "chrome_frame/test/net/fake_external_tab.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlcom.h> 8 #include <atlcom.h>
9 #include <exdisp.h> 9 #include <exdisp.h>
10 10
(...skipping 30 matching lines...) Expand all
41 #include "chrome/common/pref_names.h" 41 #include "chrome/common/pref_names.h"
42 #include "chrome/renderer/chrome_content_renderer_client.h" 42 #include "chrome/renderer/chrome_content_renderer_client.h"
43 #include "chrome_frame/crash_server_init.h" 43 #include "chrome_frame/crash_server_init.h"
44 #include "chrome_frame/test/chrome_frame_test_utils.h" 44 #include "chrome_frame/test/chrome_frame_test_utils.h"
45 #include "chrome_frame/test/net/test_automation_resource_message_filter.h" 45 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
46 #include "chrome_frame/test/simulate_input.h" 46 #include "chrome_frame/test/simulate_input.h"
47 #include "chrome_frame/test/win_event_receiver.h" 47 #include "chrome_frame/test/win_event_receiver.h"
48 #include "chrome_frame/utils.h" 48 #include "chrome_frame/utils.h"
49 #include "content/browser/plugin_service.h" 49 #include "content/browser/plugin_service.h"
50 #include "content/browser/renderer_host/render_process_host.h" 50 #include "content/browser/renderer_host/render_process_host.h"
51 #include "content/common/content_client.h"
52 #include "content/common/content_paths.h" 51 #include "content/common/content_paths.h"
53 #include "content/common/notification_service.h" 52 #include "content/common/notification_service.h"
53 #include "content/public/common/content_client.h"
54 #include "testing/gtest/include/gtest/gtest.h" 54 #include "testing/gtest/include/gtest/gtest.h"
55 #include "ui/base/resource/resource_bundle.h" 55 #include "ui/base/resource/resource_bundle.h"
56 #include "ui/base/ui_base_paths.h" 56 #include "ui/base/ui_base_paths.h"
57 57
58 namespace { 58 namespace {
59 59
60 // A special command line switch to allow developers to manually launch the 60 // A special command line switch to allow developers to manually launch the
61 // browser and debug CF inside the browser. 61 // browser and debug CF inside the browser.
62 const char kManualBrowserLaunch[] = "manual-browser"; 62 const char kManualBrowserLaunch[] = "manual-browser";
63 63
(...skipping 530 matching lines...) Expand 10 before | Expand all | Expand 10 after
594 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL); 594 base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
595 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL); 595 base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
596 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which 596 // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
597 // check if globals are created and destroyed on the same thread don't fire. 597 // check if globals are created and destroyed on the same thread don't fire.
598 // Webkit global objects are created on the inproc renderer thread. 598 // Webkit global objects are created on the inproc renderer thread.
599 #if !defined(NDEBUG) 599 #if !defined(NDEBUG)
600 ExitProcess(test_suite.test_result()); 600 ExitProcess(test_suite.test_result());
601 #endif // NDEBUG 601 #endif // NDEBUG
602 return test_suite.test_result(); 602 return test_suite.test_result();
603 } 603 }
OLDNEW
« no previous file with comments | « chrome/common/chrome_content_client.h ('k') | content/browser/accessibility/browser_accessibility_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698