Add 3 more registartion status codes for UMA collection. Also added tests.

google_apis/gcm/engine/registration_request_unittest.cc

 // Copyright 2014 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 <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
 #include "google_apis/gcm/engine/registration_request.h"
 #include "net/url_request/test_url_fetcher_factory.h"
+#include "net/url_request/url_request_status.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace gcm {
 
 namespace {
 const uint64 kAndroidId = 42UL;
 const char kCert[] = "0DEADBEEF420";
 const char kDeveloperId[] = "Project1";
 const char kLoginHeader[] = "AidLogin";
@@ skipping 35 matching lines @@
  public:
   RegistrationRequestTest();
   virtual ~RegistrationRequestTest();
 
   void RegistrationCallback(RegistrationRequest::Status status,
                             const std::string& registration_id);
 
   void CreateRequest(const std::string& sender_ids);
   void SetResponseStatusAndString(net::HttpStatusCode status_code,
                                   const std::string& response_body);
+  void SetResponseStatusAndString(net::HttpStatusCode status_code,

[fgorski, 2014/02/14 06:18:04]

In Chromium you are not suppose to overload the method name.
Given that you use it in one place, you can probably have it completely written
inside of the test case.

[juyik, 2014/02/18 20:11:01]

Done.

[juyik, 2014/02/18 20:11:01]

Done.

+                                  const net::URLRequestStatus& request_status,
+                                  const std::string& response_body);
   void CompleteFetch();
 
  protected:
   RegistrationRequest::Status status_;
   std::string registration_id_;
   bool callback_called_;
   std::map<std::string, std::string> extras_;
   scoped_ptr<RegistrationRequest> request_;
   base::MessageLoop message_loop_;
   net::TestURLFetcherFactory url_fetcher_factory_;
@@ skipping 36 matching lines @@
 
 void RegistrationRequestTest::SetResponseStatusAndString(
     net::HttpStatusCode status_code,
     const std::string& response_body) {
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   fetcher->set_response_code(status_code);
   fetcher->SetResponseString(response_body);
 }
 
+void RegistrationRequestTest::SetResponseStatusAndString(
+    net::HttpStatusCode status_code,
+    const net::URLRequestStatus& request_status,
+    const std::string& response_body) {
+  net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
+  ASSERT_TRUE(fetcher);
+  fetcher->set_response_code(status_code);
+  fetcher->set_status(request_status);
+  fetcher->SetResponseString(response_body);
+}
+
 void RegistrationRequestTest::CompleteFetch() {
   registration_id_.clear();
   status_ = RegistrationRequest::SUCCESS;
   callback_called_ = false;
 
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
@@ skipping 170 matching lines @@
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "Error=INVALID_SENDER");
   CompleteFetch();
 
   EXPECT_TRUE(callback_called_);
   EXPECT_EQ(RegistrationRequest::INVALID_SENDER, status_);
   EXPECT_EQ(std::string(), registration_id_);
 }
 
+TEST_F(RegistrationRequestTest, RequestNotSucessful) {
+  CreateRequest("sender1,sender2");
+  request_->Start();
+
+  net::URLRequestStatus request_status(net::URLRequestStatus::FAILED, 1);
+  SetResponseStatusAndString(net::HTTP_OK, request_status, "token=2501");
+  CompleteFetch();
+
+  EXPECT_FALSE(callback_called_);
+
+  // Ensuring a retry happened and succeeds.
+  request_status.set_status(net::URLRequestStatus::SUCCESS);
+  SetResponseStatusAndString(net::HTTP_OK, request_status, "token=2501");
+  CompleteFetch();
+
+  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(RegistrationRequest::SUCCESS, status_);
+  EXPECT_EQ("2501", registration_id_);
+}
+
+TEST_F(RegistrationRequestTest, ResponseHTTPNotOK) {

[fgorski, 2014/02/14 06:18:04]

ResponseHttpNotOk

[juyik, 2014/02/18 20:11:01]

Done.

+  CreateRequest("sender1,sender2");
+  request_->Start();
+
+  SetResponseStatusAndString(net::HTTP_GATEWAY_TIMEOUT, "token=2501");
+  CompleteFetch();
+
+  EXPECT_FALSE(callback_called_);
+
+  // Ensuring a retry happened and succeeds.
+  SetResponseStatusAndString(net::HTTP_OK, "token=2501");
+  CompleteFetch();
+
+  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(RegistrationRequest::SUCCESS, status_);
+  EXPECT_EQ("2501", registration_id_);
+}
+
 }  // namespace gcm