Remove the HANDLED_EXTERNALLY status code.

chrome/common/extensions/extension_localization_peer_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 <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
 #include "chrome/common/extensions/message_bundle.h"
@@ skipping 51 matching lines @@
       const GURL& new_url,
       const webkit_glue::ResourceResponseInfo& info,
       bool* has_new_first_party_for_cookies,
       GURL* new_first_party_for_cookies));
   MOCK_METHOD1(OnReceivedResponse, void(
       const webkit_glue::ResourceResponseInfo& info));
   MOCK_METHOD1(OnDownloadedData, void(int len));
   MOCK_METHOD3(OnReceivedData, void(const char* data,
                                     int data_length,
                                     int encoded_data_length));
-  MOCK_METHOD3(OnCompletedRequest, void(
-      const net::URLRequestStatus& status,
+  MOCK_METHOD4(OnCompletedRequest, void(
+      int error_code,
+      bool was_ignored_by_handler,
       const std::string& security_info,
       const base::TimeTicks& completion_time));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MockResourceLoaderBridgePeer);
 };
 
 class ExtensionLocalizationPeerTest : public testing::Test {
  protected:
   virtual void SetUp() {
@@ skipping 51 matching lines @@
 }
 
 MATCHER_P(IsURLRequestEqual, status, "") { return arg.status() == status; }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestBadURLRequestStatus) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer = filter_peer_.release();
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-    IsURLRequestEqual(net::URLRequestStatus::CANCELED), "", base::TimeTicks()));
+    net::ERR_ABORTED, false, "", base::TimeTicks()));
 
-  net::URLRequestStatus status;
-  status.set_status(net::URLRequestStatus::FAILED);
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::ERR_FAILED, false, "",
+                                  base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestEmptyData) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer = filter_peer_.release();
 
   EXPECT_CALL(*original_peer_, OnReceivedData(_, _, _)).Times(0);
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
-      base::TimeTicks()));
+      net::OK, false, "", base::TimeTicks()));
 
-  net::URLRequestStatus status;
-  status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::OK, false, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestNoCatalogs) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer = filter_peer_.release();
 
   SetData(filter_peer, "some text");
 
   EXPECT_CALL(*sender_, Send(_));
 
   std::string data = GetData(filter_peer);
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length(), -1)).Times(2);
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_)).Times(2);
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(
-          net::URLRequestStatus::SUCCESS), "", base::TimeTicks())).Times(2);
+          net::OK, false, "", base::TimeTicks())).Times(2);
 
-  net::URLRequestStatus status;
-  status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::OK, false, "", base::TimeTicks());
 
   // Test if Send gets called again (it shouldn't be) when first call returned
   // an empty dictionary.
   filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_1));
   SetData(filter_peer, "some text");
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::OK, false, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestWithCatalogs) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_2));
 
   extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
   extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
       *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id2"] = messages;
 
   SetData(filter_peer, "some __MSG_text__");
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_text__ gets replaced with "new text".
   std::string data("some new text");
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(data.data()), data.length(), -1));
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
-      base::TimeTicks()));
+      net::OK, false, "", base::TimeTicks()));
 
-  net::URLRequestStatus status;
-  status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::OK, false, "", base::TimeTicks());
 }
 
 TEST_F(ExtensionLocalizationPeerTest, OnCompletedRequestReplaceMessagesFails) {
   // It will self-delete once it exits OnCompletedRequest.
   ExtensionLocalizationPeer* filter_peer =
       CreateExtensionLocalizationPeer("text/css", GURL(kExtensionUrl_3));
 
   extensions::L10nMessagesMap messages;
   messages.insert(std::make_pair("text", "new text"));
   extensions::ExtensionToL10nMessagesMap& l10n_messages_map =
       *extensions::GetExtensionToL10nMessagesMap();
   l10n_messages_map["some_id3"] = messages;
 
   std::string message("some __MSG_missing_message__");
   SetData(filter_peer, message);
 
   // We already have messages in memory, Send will be skipped.
   EXPECT_CALL(*sender_, Send(_)).Times(0);
 
   // __MSG_missing_message__ is missing, so message stays the same.
   EXPECT_CALL(*original_peer_,
               OnReceivedData(StrEq(message.data()), message.length(), -1));
 
   EXPECT_CALL(*original_peer_, OnReceivedResponse(_));
   EXPECT_CALL(*original_peer_, OnCompletedRequest(
-      IsURLRequestEqual(net::URLRequestStatus::SUCCESS), "",
-      base::TimeTicks()));
+      net::OK, false, "", base::TimeTicks()));
 
-  net::URLRequestStatus status;
-  status.set_status(net::URLRequestStatus::SUCCESS);
-  filter_peer->OnCompletedRequest(status, "", base::TimeTicks());
+  filter_peer->OnCompletedRequest(net::OK, false, "", base::TimeTicks());
 }