Removing the Dev channel restriction for requestBody of Web Request API.

chrome/browser/extensions/api/web_request/web_request_api_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 #include <queue>
 
+#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/prefs/public/pref_member.h"
@@ skipping 18 matching lines @@
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "net/base/auth.h"
 #include "net/base/capturing_net_log.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
 #include "net/base/upload_bytes_element_reader.h"
 #include "net/base/upload_data_stream.h"
 #include "net/base/upload_file_element_reader.h"
 #include "net/url_request/url_request_test_util.h"
+#include "testing/gtest/include/gtest/gtest-message.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace helpers = extension_web_request_api_helpers;
 namespace keys = extension_web_request_api_constants;
 
 using base::BinaryValue;
 using base::DictionaryValue;
 using base::ListValue;
 using base::StringValue;
 using base::Time;
@@ skipping 452 matching lines @@
   // We verify that URLRequest body is accessible to OnBeforeRequest listeners.
   // These testing steps are repeated twice in a row:
   // 1. Register an extension requesting "requestBody" in ExtraInfoSpec and
   //    file a POST URLRequest with a multipart-encoded form. See it getting
   //    parsed.
   // 2. Do the same, but without requesting "requestBody". Nothing should be
   //    parsed.
   // 3. With "requestBody", fire a POST URLRequest which is not a parseable
   //    HTML form. Raw data should be returned.
   // 4. Do the same, but with a PUT method. Result should be the same.
-  // Each of these steps is done once as if the channel was DEV or CANARY,
-  // and once as if it was BETA or STABLE. It is checked that parsed data is
-  // available on DEV/CANARY but not on BETA/STABLE.
   const std::string kMethodPost("POST");
   const std::string kMethodPut("PUT");
 
   // Input.
   const char kPlainBlock1[] = "abcd\n";
   const size_t kPlainBlock1Length = sizeof(kPlainBlock1) - 1;
   std::vector<char> plain_1(kPlainBlock1, kPlainBlock1 + kPlainBlock1Length);
   const char kPlainBlock2[] = "1234\n";
   const size_t kPlainBlock2Length = sizeof(kPlainBlock2) - 1;
   std::vector<char> plain_2(kPlainBlock2, kPlainBlock2 + kPlainBlock2Length);
@@ skipping 46 matching lines @@
   extensions::subtle::AppendKeyValuePair(
       keys::kRequestBodyRawBytesKey,
       BinaryValue::CreateWithCopiedBuffer(kPlainBlock2, kPlainBlock2Length),
       &raw);
   // Summary.
   const Value* const kExpected[] = {
     form_data.get(),
     NULL,
     &raw,
     &raw,
-    NULL, NULL, NULL, NULL  // These are for the disabled cases.
   };
+  COMPILE_ASSERT(arraysize(kPath) == arraysize(kExpected),
+                 the_arrays_kPath_and_kExpected_need_to_be_the_same_size);
   // Header.
   const char kMultipart[] = "multipart/form-data; boundary=" kBoundary;
 #undef kBoundary
 
   // Set up a dummy extension name.
   const std::string kEventName(keys::kOnBeforeRequestEvent);
   ExtensionWebRequestEventRouter::RequestFilter filter;
   std::string extension_id("1");
   const std::string string_spec_post("blocking,requestBody");
   const std::string string_spec_no_post("blocking");
   int extra_info_spec_empty = 0;
   int extra_info_spec_body = 0;
   base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
 
-  // All the tests are done twice, once with the release channel pretending to
-  // be one of DEV/CANARY, once BETA/STABLE. Hence two passes.
-  for (int pass = 0; pass < 2; ++pass) {
-    {
-      Feature::ScopedCurrentChannel sc(
-          pass > 0 ? VersionInfo::CHANNEL_BETA : VersionInfo::CHANNEL_CANARY);
+  // Part 1.

[vabr (Chromium), 2013/01/28 10:26:14]

In this block I only removed the for loop, the additional scopes, and the scoped
current channels. Unfortunately, due to the changed indentation of everything
most of the unchanged code is displayed as changed as well.

+  // Subscribe to OnBeforeRequest with requestBody requirement.
+  ASSERT_TRUE(GenerateInfoSpec(string_spec_post, &extra_info_spec_body));
+  ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
+      &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
+      filter, extra_info_spec_body, -1, -1,
+      ipc_sender_factory.GetWeakPtr());
 
-      // Part 1.
-      // Subscribe to OnBeforeRequest with requestBody requirement.
-      ASSERT_TRUE(GenerateInfoSpec(string_spec_post, &extra_info_spec_body));
-      ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
-          &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
-          filter, extra_info_spec_body, -1, -1,
-          ipc_sender_factory.GetWeakPtr());
+  FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
 
-      FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
+  // We inspect the result in the message list of |ipc_sender_| later.
+  MessageLoop::current()->RunUntilIdle();
 
-      // We inspect the result in the message list of |ipc_sender_| later.
-      MessageLoop::current()->RunUntilIdle();
+  ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
+      &profile_, extension_id, kEventName + "/1");
 
-      ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
-          &profile_, extension_id, kEventName + "/1");
-    }
+  // Part 2.
+  // Now subscribe to OnBeforeRequest *without* the requestBody requirement.
+  ASSERT_TRUE(
+      GenerateInfoSpec(string_spec_no_post, &extra_info_spec_empty));
+  ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
+      &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
+      filter, extra_info_spec_empty, -1, -1,
+      ipc_sender_factory.GetWeakPtr());
 
-    {
-      Feature::ScopedCurrentChannel sc(
-          pass > 0 ? VersionInfo::CHANNEL_STABLE : VersionInfo::CHANNEL_DEV);
+  FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
 
-      // Part 2.
-      // Now subscribe to OnBeforeRequest *without* the requestBody requirement.
-      ASSERT_TRUE(
-          GenerateInfoSpec(string_spec_no_post, &extra_info_spec_empty));
-      ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
-          &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
-          filter, extra_info_spec_empty, -1, -1,
-          ipc_sender_factory.GetWeakPtr());
+  ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
+      &profile_, extension_id, kEventName + "/1");
 
-      FireURLRequestWithData(kMethodPost, kMultipart, form_1, form_2);
+  // Subscribe to OnBeforeRequest with requestBody requirement.
+  ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
+      &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
+      filter, extra_info_spec_body, -1, -1,
+      ipc_sender_factory.GetWeakPtr());
 
-      ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
-          &profile_, extension_id, kEventName + "/1");
-    }
+  // Part 3.
+  // Now send a POST request with body which is not parseable as a form.
+  FireURLRequestWithData(kMethodPost, NULL /*no header*/, plain_1, plain_2);
 
-    {
-      Feature::ScopedCurrentChannel sc(
-          pass > 0 ? VersionInfo::CHANNEL_STABLE : VersionInfo::CHANNEL_DEV);
+  // Part 4.
+  // Now send a PUT request with the same body as above.
+  FireURLRequestWithData(kMethodPut, NULL /*no header*/, plain_1, plain_2);
 
-      // Subscribe to OnBeforeRequest with requestBody requirement.
-      ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
-          &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
-          filter, extra_info_spec_body, -1, -1,
-          ipc_sender_factory.GetWeakPtr());
+  MessageLoop::current()->RunUntilIdle();
 
-      // Part 3.
-      // Now send a POST request with body which is not parseable as a form.
-      FireURLRequestWithData(kMethodPost, NULL /*no header*/, plain_1, plain_2);
-
-      // Part 4.
-      // Now send a PUT request with the same body as above.
-      FireURLRequestWithData(kMethodPut, NULL /*no header*/, plain_1, plain_2);
-
-      MessageLoop::current()->RunUntilIdle();
-
-      // Clean-up.
-      ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
-          &profile_, extension_id, kEventName + "/1");
-    }
-  }
+  // Clean-up.
+  ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
+      &profile_, extension_id, kEventName + "/1");
 
   IPC::Message* message = NULL;
   TestIPCSender::SentMessages::const_iterator i = ipc_sender_.sent_begin();
   for (size_t test = 0; test < arraysize(kExpected); ++test) {
+    SCOPED_TRACE(testing::Message("iteration number ") << test);
     EXPECT_NE(i, ipc_sender_.sent_end());
     message = (i++)->get();
     const DictionaryValue* details;
     ExtensionMsg_MessageInvoke::Param param;
     GetPartOfMessageArguments(message, &details, &param);
     ASSERT_TRUE(details != NULL);
     const Value* result = NULL;
-    EXPECT_EQ(
-        kExpected[test] != NULL,
-        details->Get(*(kPath[test % arraysize(kPath)]), &result));
-    if (kExpected[test] != NULL) {
+    if (kExpected[test]) {
+      EXPECT_TRUE(details->Get(*(kPath[test]), &result));
       EXPECT_TRUE(kExpected[test]->Equals(result));
+    } else {
+      EXPECT_FALSE(details->Get(*(kPath[test]), &result));
     }
   }
 
   EXPECT_EQ(i, ipc_sender_.sent_end());
 }
 
 TEST_F(ExtensionWebRequestTest, NoAccessRequestBodyData) {
   // We verify that URLRequest body is NOT accessible to OnBeforeRequest
   // listeners when the type of the request is different from POST or PUT, or
   // when the request body is empty. 3 requests are fired, without upload data,
   // a POST, PUT and GET request. For none of them the "requestBody" object
   // property should be present in the details passed to the onBeforeRequest
   // event listener.
   const char* kMethods[] = { "POST", "PUT", "GET" };
 
   // Set up a dummy extension name.
   const std::string kEventName(keys::kOnBeforeRequestEvent);
   ExtensionWebRequestEventRouter::RequestFilter filter;
   const std::string extension_id("1");
   int extra_info_spec = 0;
   ASSERT_TRUE(GenerateInfoSpec("blocking,requestBody", &extra_info_spec));
   base::WeakPtrFactory<TestIPCSender> ipc_sender_factory(&ipc_sender_);
 
-  // We need to pretend to be on CANARY or DEV for the "requestBody" to work.
-  Feature::ScopedCurrentChannel sc(VersionInfo::CHANNEL_CANARY);
-
   // Subscribe to OnBeforeRequest with requestBody requirement.
   ExtensionWebRequestEventRouter::GetInstance()->AddEventListener(
       &profile_, extension_id, extension_id, kEventName, kEventName + "/1",
       filter, extra_info_spec, -1, -1, ipc_sender_factory.GetWeakPtr());
 
   // The request URL can be arbitrary but must have an HTTP or HTTPS scheme.
   const GURL request_url("http://www.example.com");
 
   for (size_t i = 0; i < arraysize(kMethods); ++i) {
     net::URLRequest request(request_url, &delegate_, context_.get());
     request.set_method(kMethods[i]);
     ipc_sender_.PushTask(base::Bind(&base::DoNothing));
     request.Start();
   }
 
   // We inspect the result in the message list of |ipc_sender_| later.
   MessageLoop::current()->RunUntilIdle();
 
   ExtensionWebRequestEventRouter::GetInstance()->RemoveEventListener(
       &profile_, extension_id, kEventName + "/1");
 
   TestIPCSender::SentMessages::const_iterator i = ipc_sender_.sent_begin();
   for (size_t test = 0; test < arraysize(kMethods); ++test, ++i) {
+    SCOPED_TRACE(testing::Message("iteration number ") << test);
     EXPECT_NE(i, ipc_sender_.sent_end());
     IPC::Message* message = i->get();
     const DictionaryValue* details = NULL;
     ExtensionMsg_MessageInvoke::Param param;
     GetPartOfMessageArguments(message, &details, &param);
     ASSERT_TRUE(details != NULL);
-    EXPECT_FALSE(details->HasKey(keys::kRequestBodyKey))
-        << "Failed during iteration number " << test << ".";
+    EXPECT_FALSE(details->HasKey(keys::kRequestBodyKey));
   }
 
   EXPECT_EQ(i, ipc_sender_.sent_end());
 }
 
 struct HeaderModificationTest_Header {
   const char* name;
   const char* value;
 };
 
@@ skipping 234 matching lines @@
       true,
       ExtensionWebRequestEventRouter::ExtraInfoSpec::RESPONSE_HEADERS);
   TestInitFromValue(
       "blocking",
       true,
       ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING);
   TestInitFromValue(
       "asyncBlocking",
       true,
       ExtensionWebRequestEventRouter::ExtraInfoSpec::ASYNC_BLOCKING);
-  {
-    Feature::ScopedCurrentChannel sc(VersionInfo::CHANNEL_BETA);
-    TestInitFromValue(
-        "requestBody",
-        true,
-        0);
-  }
-  {
-    Feature::ScopedCurrentChannel sc(VersionInfo::CHANNEL_DEV);
-    TestInitFromValue(
-        "requestBody",
-        true,
-        ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_BODY);
-  }
+  TestInitFromValue(
+      "requestBody",
+      true,
+      ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_BODY);
 
   // Multiple valid values are bitwise-or'ed.
   TestInitFromValue(
       "requestHeaders,blocking",
       true,
       ExtensionWebRequestEventRouter::ExtraInfoSpec::REQUEST_HEADERS |
       ExtensionWebRequestEventRouter::ExtraInfoSpec::BLOCKING);
 
   // Any invalid values lead to a bad parse.
   TestInitFromValue("invalidValue", false, 0);
@@ skipping 1127 matching lines @@
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, warning_set.size());
   EXPECT_TRUE(HasWarning(warning_set, "extid2"));
   EXPECT_EQ(3u, capturing_net_log.GetSize());
 }
 
 }  // namespace extensions