summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions
diff options
context:
space:
mode:
authorevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 18:33:44 +0000
committerevan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-08 18:33:44 +0000
commit11a9be5aa30a13162043e73de9cf8ea5a34ebfc2 (patch)
treee4f0d3257371fc61aaf87ba97e1979250a928a89 /chrome/browser/extensions
parentaf271b83ad74f379f42a983b440823670e06926a (diff)
downloadchromium_src-11a9be5aa30a13162043e73de9cf8ea5a34ebfc2.zip
chromium_src-11a9be5aa30a13162043e73de9cf8ea5a34ebfc2.tar.gz
chromium_src-11a9be5aa30a13162043e73de9cf8ea5a34ebfc2.tar.bz2
Revert r49169 and r49170; they didn't fix the problem.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49175 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r--chrome/browser/extensions/extension_messages_unittest.cc11
1 files changed, 0 insertions, 11 deletions
diff --git a/chrome/browser/extensions/extension_messages_unittest.cc b/chrome/browser/extensions/extension_messages_unittest.cc
index b74ea1f..b90e92f 100644
--- a/chrome/browser/extensions/extension_messages_unittest.cc
+++ b/chrome/browser/extensions/extension_messages_unittest.cc
@@ -9,10 +9,6 @@
#include "chrome/test/render_view_test.h"
#include "testing/gtest/include/gtest/gtest.h"
-// See disable note at RenderViewTest.ExtensionMessagesOnConnect. Unused
-// functions cause warnings.
-#if 0
-
static void DispatchOnConnect(int source_port_id, const std::string& name,
const std::string& tab_json) {
ListValue args;
@@ -33,8 +29,6 @@ static void DispatchOnDisconnect(int source_port_id) {
GURL());
}
-#endif // Disable unused functions.
-
static void DispatchOnMessage(const std::string& message, int source_port_id) {
ListValue args;
args.Set(0, Value::CreateStringValue(message));
@@ -90,9 +84,6 @@ TEST_F(RenderViewTest, ExtensionMessagesOpenChannel) {
EXPECT_EQ(L"content got: 42", alert_param.a);
}
-// Disabling these tests as they're hosing the test runner.
-#if 0
-
// Tests that the bindings for handling a new channel connection and channel
// closing all works.
TEST_F(RenderViewTest, ExtensionMessagesOnConnect) {
@@ -157,5 +148,3 @@ TEST_F(RenderViewTest, ExtensionMessagesOnConnect) {
ASSERT_TRUE(IPC::ReadParam(alert_msg, &iter, &alert_param));
EXPECT_EQ(L"disconnected: 24", alert_param.a);
}
-
-#endif // Tests disabled.