diff options
Diffstat (limited to 'chrome/browser')
8 files changed, 10 insertions, 9 deletions
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS index 70dd958..624ca50 100644 --- a/chrome/browser/DEPS +++ b/chrome/browser/DEPS @@ -33,7 +33,6 @@ include_rules = [ # DO NOT ADD ANY MORE ITEMS TO THE LIST BELOW! "+content/browser/download/download_state_info.h", "+content/browser/geolocation/wifi_data_provider_common.h", - "+content/browser/renderer_host/mock_render_process_host.h", "+content/browser/renderer_host/render_process_host_browsertest.h", "+content/browser/renderer_host/render_view_host_factory.h", "+content/browser/renderer_host/render_widget_host_view_mac_delegate.h", diff --git a/chrome/browser/autofill/autofill_browsertest.cc b/chrome/browser/autofill/autofill_browsertest.cc index 39eeac7..7c28a78 100644 --- a/chrome/browser/autofill/autofill_browsertest.cc +++ b/chrome/browser/autofill/autofill_browsertest.cc @@ -26,11 +26,11 @@ #include "chrome/renderer/translate_helper.h" #include "chrome/test/base/in_process_browser_test.h" #include "chrome/test/base/ui_test_utils.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_url_fetcher_factory.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/base/keycodes/keyboard_codes.h" diff --git a/chrome/browser/autofill/autofill_manager_unittest.cc b/chrome/browser/autofill/autofill_manager_unittest.cc index 94ec873..2938428 100644 --- a/chrome/browser/autofill/autofill_manager_unittest.cc +++ b/chrome/browser/autofill/autofill_manager_unittest.cc @@ -30,8 +30,8 @@ #include "chrome/common/chrome_switches.h" #include "chrome/common/pref_names.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_browser_thread.h" #include "googleurl/src/gurl.h" #include "grit/generated_resources.h" diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc index c1ca818..cd58345 100644 --- a/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc +++ b/chrome/browser/geolocation/chrome_geolocation_permission_context_unittest.cc @@ -19,17 +19,18 @@ #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/notification_registrar.h" #include "content/public/browser/notification_service.h" #include "content/test/mock_geolocation.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_browser_thread.h" #include "content/test/test_renderer_host.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; +using content::MockRenderProcessHost; using content::RenderViewHostTester; using content::WebContents; diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc index 5e77a1d..6fd68cc 100644 --- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc +++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc @@ -16,8 +16,8 @@ #include "chrome/common/safe_browsing/csd.pb.h" #include "chrome/common/safe_browsing/safebrowsing_messages.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_browser_thread.h" #include "content/test/test_renderer_host.h" #include "googleurl/src/gurl.h" diff --git a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc index 051bbb4..8fbe7ed 100644 --- a/chrome/browser/tab_contents/thumbnail_generator_unittest.cc +++ b/chrome/browser/tab_contents/thumbnail_generator_unittest.cc @@ -8,9 +8,9 @@ #include "chrome/browser/tab_contents/thumbnail_generator.h" #include "chrome/common/render_messages.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_renderer_host.h" #include "skia/ext/platform_canvas.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/translate/translate_manager_browsertest.cc b/chrome/browser/translate/translate_manager_browsertest.cc index 71382da..578cf82 100644 --- a/chrome/browser/translate/translate_manager_browsertest.cc +++ b/chrome/browser/translate/translate_manager_browsertest.cc @@ -28,18 +28,18 @@ #include "chrome/common/render_messages.h" #include "chrome/test/base/testing_browser_process.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/browser/tab_contents/test_tab_contents.h" #include "content/public/browser/navigation_details.h" #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_registrar.h" +#include "content/test/mock_render_process_host.h" #include "content/test/notification_observer_mock.h" #include "content/test/render_view_test.h" #include "content/test/test_browser_thread.h" #include "content/test/test_renderer_host.h" -#include "content/test/test_url_fetcher_factory.h" #include "content/test/test_renderer_host.h" +#include "content/test/test_url_fetcher_factory.h" #include "grit/generated_resources.h" #include "ipc/ipc_test_sink.h" #include "testing/gmock/include/gmock/gmock.h" diff --git a/chrome/browser/visitedlink/visitedlink_unittest.cc b/chrome/browser/visitedlink/visitedlink_unittest.cc index e12a533..54228bb 100644 --- a/chrome/browser/visitedlink/visitedlink_unittest.cc +++ b/chrome/browser/visitedlink/visitedlink_unittest.cc @@ -18,15 +18,16 @@ #include "chrome/renderer/visitedlink_slave.h" #include "chrome/test/base/chrome_render_view_host_test_harness.h" #include "chrome/test/base/testing_profile.h" -#include "content/browser/renderer_host/mock_render_process_host.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_types.h" +#include "content/test/mock_render_process_host.h" #include "content/test/test_browser_thread.h" #include "content/test/test_renderer_host.h" #include "googleurl/src/gurl.h" #include "testing/gtest/include/gtest/gtest.h" using content::BrowserThread; +using content::MockRenderProcessHost; using content::RenderViewHostTester; namespace { |