Fix CryptAuthApiCallFlow resulting in an error if the server returns an empty string.

components/proximity_auth/cryptauth/cryptauth_api_call_flow_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 "components/proximity_auth/cryptauth/cryptauth_api_call_flow.h"
 
 #include "base/test/test_simple_task_runner.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 84 matching lines @@
   void OnRequestEnd(int fetcher_id) override {}
 
   net::TestURLFetcher* url_fetcher_;
   scoped_ptr<std::string> result_;
   scoped_ptr<std::string> error_message_;
 
  private:
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
   scoped_ptr<net::TestURLFetcherFactory> url_fetcher_factory_;
   CryptAuthApiCallFlow flow_;
+
+  DISALLOW_COPY_AND_ASSIGN(ProximityAuthCryptAuthApiCallFlowTest);
 };
 
 TEST_F(ProximityAuthCryptAuthApiCallFlowTest, RequestSuccess) {
   StartApiCallFlow();
   CompleteCurrentRequest(
       net::URLRequestStatus::SUCCESS, net::HTTP_OK, kSerializedResponseProto);
   EXPECT_EQ(kSerializedResponseProto, *result_);
   EXPECT_FALSE(error_message_);
 }
 
 TEST_F(ProximityAuthCryptAuthApiCallFlowTest, RequestFailure) {
   StartApiCallFlow();
   CompleteCurrentRequest(net::URLRequestStatus::FAILED, 0, std::string());
   EXPECT_FALSE(result_);
   EXPECT_EQ("Request failed", *error_message_);
 }
 
 TEST_F(ProximityAuthCryptAuthApiCallFlowTest, RequestStatus500) {
   StartApiCallFlow();
   CompleteCurrentRequest(net::URLRequestStatus::SUCCESS,
                          net::HTTP_INTERNAL_SERVER_ERROR,
                          "CryptAuth Meltdown.");
   EXPECT_FALSE(result_);
   EXPECT_EQ("HTTP status: 500", *error_message_);
 }
 
+// The empty string is a valid protocol buffer message serialization.
 TEST_F(ProximityAuthCryptAuthApiCallFlowTest, ResponseWithNoBody) {
   StartApiCallFlow();
   CompleteCurrentRequest(
       net::URLRequestStatus::SUCCESS, net::HTTP_OK, std::string());
-  EXPECT_FALSE(result_);
-  EXPECT_EQ("No response body", *error_message_);
+  EXPECT_EQ(std::string(), *result_);
+  EXPECT_FALSE(error_message_);
 }

[Ilya Sherman, 2014/12/10 23:38:29]

Please add a new test to provide coverage for the "kResponseBodyError" case.

[Tim Song, 2014/12/11 00:12:55]

Hmm... I'm note sure how to force this error, as the URLFetcher should be
properly configured in the callback. However, I'm hesitant to change this to a
CHECK.

 
 }  // namespace proximity_auth