Create a public header with the child_process_sandbox_support_linux functions that are used in chrome. Also move everything to the content namespace, now that we have one. This gets rid of the last content/common includes from chrome/renderer and so I've tightened up the DEPS.
Also get rid of the webkit_glue versions of the font functions since they weren't used anymore.
BUG=98716
Review URL: http://codereview.chromium.org/8319017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105956 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/renderer/content_settings_observer_browsertest.cc b/chrome/renderer/content_settings_observer_browsertest.cc
index 735501de..bc11b176 100644
--- a/chrome/renderer/content_settings_observer_browsertest.cc
+++ b/chrome/renderer/content_settings_observer_browsertest.cc
@@ -6,7 +6,6 @@
#include "chrome/common/render_messages.h"
#include "chrome/renderer/content_settings_observer.h"
#include "chrome/test/base/chrome_render_view_test.h"
-#include "content/common/view_messages.h"
#include "content/public/renderer/render_view.h"
#include "ipc/ipc_message_macros.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -115,13 +114,10 @@
render_thread_->sink().ClearMessages();
// 3. Reload page.
- ViewMsg_Navigate_Params params;
std::string url_str = "data:text/html;charset=utf-8,";
url_str.append(html);
GURL url(url_str);
- params.url = url;
- params.navigation_type = ViewMsg_Navigate_Type::RELOAD;
- OnNavigate(params);
+ Reload(url);
ProcessPendingMessages();
// 4. Verify that the notification that javascript was blocked is sent after
@@ -130,7 +126,7 @@
int block_index = -1;
for (size_t i = 0; i < render_thread_->sink().message_count(); ++i) {
const IPC::Message* msg = render_thread_->sink().GetMessageAt(i);
- if (msg->type() == ViewHostMsg_FrameNavigate::ID)
+ if (msg->type() == GetNavigationIPCType())
navigation_index = i;
if (msg->type() == ChromeViewHostMsg_ContentBlocked::ID)
block_index = i;
