| OLD | NEW |
| 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/common/content_settings.h" | 5 #include "chrome/common/content_settings.h" |
| 6 #include "chrome/common/render_messages.h" | 6 #include "chrome/common/render_messages.h" |
| 7 #include "chrome/renderer/content_settings_observer.h" | 7 #include "chrome/renderer/content_settings_observer.h" |
| 8 #include "chrome/test/render_view_test.h" | 8 #include "chrome/test/base/render_view_test.h" |
| 9 #include "content/common/view_messages.h" | 9 #include "content/common/view_messages.h" |
| 10 #include "ipc/ipc_message_macros.h" | 10 #include "ipc/ipc_message_macros.h" |
| 11 #include "testing/gmock/include/gmock/gmock.h" | 11 #include "testing/gmock/include/gmock/gmock.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" | 13 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" |
| 14 | 14 |
| 15 using testing::_; | 15 using testing::_; |
| 16 using testing::DeleteArg; | 16 using testing::DeleteArg; |
| 17 | 17 |
| 18 namespace { | 18 namespace { |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 const IPC::Message* msg = render_thread_.sink().GetMessageAt(i); | 131 const IPC::Message* msg = render_thread_.sink().GetMessageAt(i); |
| 132 if (msg->type() == ViewHostMsg_FrameNavigate::ID) | 132 if (msg->type() == ViewHostMsg_FrameNavigate::ID) |
| 133 navigation_index = i; | 133 navigation_index = i; |
| 134 if (msg->type() == ViewHostMsg_ContentBlocked::ID) | 134 if (msg->type() == ViewHostMsg_ContentBlocked::ID) |
| 135 block_index = i; | 135 block_index = i; |
| 136 } | 136 } |
| 137 EXPECT_NE(-1, navigation_index); | 137 EXPECT_NE(-1, navigation_index); |
| 138 EXPECT_NE(-1, block_index); | 138 EXPECT_NE(-1, block_index); |
| 139 EXPECT_LT(navigation_index, block_index); | 139 EXPECT_LT(navigation_index, block_index); |
| 140 } | 140 } |
| OLD | NEW |