Remove URLRequestStatus mutators and introduce FromError.

chrome/browser/autofill/autofill_interactive_uitest.cc

 // Copyright (c) 2013 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 <string>
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
 #include "base/memory/ref_counted.h"
@@ skipping 28 matching lines @@
 #include "components/translate/core/browser/translate_infobar_delegate.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_renderer_host.h"
+#include "net/base/net_errors.h"
 #include "net/url_request/test_url_fetcher_factory.h"
+#include "net/url_request/url_request_status.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
 using base::ASCIIToUTF16;
 
 namespace autofill {
 
 static const char kDataURIPrefix[] = "data:text/html;charset=utf-8,";
 static const char kTestFormString[] =
@@ skipping 154 matching lines @@
         GetWebContents(),
         "window.domAutomationController.send("
         "    document.defaultView.getComputedStyle(document.getElementById('" +
         field_name + "')).backgroundColor);",
         color));
   }
 
   void SimulateURLFetch(bool success) {
     net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
     ASSERT_TRUE(fetcher);
-    net::URLRequestStatus status;
-    status.set_status(success ? net::URLRequestStatus::SUCCESS :
-                                net::URLRequestStatus::FAILED);
+    int error = success ? net::OK : net::ERR_FAILED;

[mmenke, 2015/06/02 18:41:33]

Suggest making these net::Errors - not the current way of doing things, but
Eric's looking into changing that, so may as well make his life a little easier.

[davidben, 2015/06/02 19:19:42]

Done. Should I also change URLRequestStatus? I left that alone in case changing
the type of URLRS::error() would break stuff, but it's probably fine?

[mmenke, 2015/06/02 19:22:25]

I guess we never store (Or *should* never store) bytes read in there, but I'm
sufficiently paranoid that I think we should just keep that as int for now.

 
     std::string script = " var google = {};"
         "google.translate = (function() {"
         "  return {"
         "    TranslateService: function() {"
         "      return {"
         "        isAvailable : function() {"
         "          return true;"
         "        },"
         "        restore : function() {"
         "          return;"
         "        },"
         "        getDetectedLanguage : function() {"
         "          return \"ja\";"
         "        },"
         "        translatePage : function(originalLang, targetLang,"
         "                                 onTranslateProgress) {"
         "          document.getElementsByTagName(\"body\")[0].innerHTML = '" +
         std::string(kTestFormString) +
         "              ';"
         "          onTranslateProgress(100, true, false);"
         "        }"
         "      };"
         "    }"
         "  };"
         "})();"
         "cr.googleTranslate.onTranslateElementLoad();";
 
     fetcher->set_url(fetcher->GetOriginalURL());
-    fetcher->set_status(status);
+    fetcher->set_status(net::URLRequestStatus::FromError(error));
     fetcher->set_response_code(success ? 200 : 500);
     fetcher->SetResponseString(script);
     fetcher->delegate()->OnURLFetchComplete(fetcher);
   }
 
   void FocusFirstNameField() {
     bool result = false;
     ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
         GetRenderViewHost(),
         "if (document.readyState === 'complete')"
@@ skipping 1091 matching lines @@
   ASSERT_TRUE(content::ExecuteScript(
       GetRenderViewHost(),
       "document.querySelector('input').autocomplete = 'off';"));
 
   // Press the down arrow to select the suggestion and attempt to preview the
   // autofilled form.
   SendKeyToPopupAndWait(ui::VKEY_DOWN);
 }
 
 }  // namespace autofill