Move IdentityProvider usage from GCMDriverDesktop to GCMProfileService

google_apis/gcm/engine/checkin_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 <string>
 #include <vector>

[bartfab (slow), 2014/06/13 11:27:22]

Nit: No longer used.

[jianli, 2014/06/13 18:04:49]

Done.

 
 #include "google_apis/gcm/engine/checkin_request.h"
 #include "google_apis/gcm/monitoring/fake_gcm_stats_recorder.h"
 #include "google_apis/gcm/protocol/checkin.pb.h"
 #include "net/base/backoff_entry.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"
 
 namespace gcm {
@@ skipping 66 matching lines @@
 
  protected:
   bool callback_called_;
   uint64 android_id_;
   uint64 security_token_;
   int checkin_device_type_;
   base::MessageLoop message_loop_;
   net::TestURLFetcherFactory url_fetcher_factory_;
   scoped_refptr<net::TestURLRequestContextGetter> url_request_context_getter_;
   checkin_proto::ChromeBuildProto chrome_build_proto_;
-  std::vector<std::string> account_ids_;
   scoped_ptr<CheckinRequest> request_;
   FakeGCMStatsRecorder recorder_;
 };
 
 CheckinRequestTest::CheckinRequestTest()
     : callback_called_(false),
       android_id_(kBlankAndroidId),
       security_token_(kBlankSecurityToken),
       checkin_device_type_(0),
       url_request_context_getter_(new net::TestURLRequestContextGetter(
           message_loop_.message_loop_proxy())) {
-  account_ids_.push_back("account_id");
 }
 
 CheckinRequestTest::~CheckinRequestTest() {}
 
 void CheckinRequestTest::FetcherCallback(
     const checkin_proto::AndroidCheckinResponse& checkin_response) {
   callback_called_ = true;
   if (checkin_response.has_android_id())
     android_id_ = checkin_response.android_id();
   if (checkin_response.has_security_token())
     security_token_ = checkin_response.security_token();
 }
 
 void CheckinRequestTest::CreateRequest(uint64 android_id,
                                        uint64 security_token) {
   // First setup a chrome_build protobuf.
   chrome_build_proto_.set_platform(
       checkin_proto::ChromeBuildProto::PLATFORM_LINUX);
   chrome_build_proto_.set_channel(
       checkin_proto::ChromeBuildProto::CHANNEL_CANARY);
   chrome_build_proto_.set_chrome_version(kChromeVersion);
 
   CheckinRequest::RequestInfo request_info(
       android_id,
       security_token,
       kSettingsDigest,
-      account_ids_,
       chrome_build_proto_);
   // Then create a request with that protobuf and specified android_id,
   // security_token.
   request_.reset(new CheckinRequest(
       GURL(kCheckinURL),
       request_info,
       kDefaultBackoffPolicy,
       base::Bind(&CheckinRequestTest::FetcherCallback, base::Unretained(this)),
       url_request_context_getter_.get(),
       &recorder_));
@@ skipping 62 matching lines @@
             request_proto.checkin().chrome_build().channel());
 
 #if defined(CHROME_OS)
   EXPECT_EQ(checkin_proto::DEVICE_CHROME_OS, request_proto.checkin().type());
 #else
   EXPECT_EQ(checkin_proto::DEVICE_CHROME_BROWSER,
             request_proto.checkin().type());
 #endif
 
   EXPECT_EQ(kSettingsDigest, request_proto.digest());
-  EXPECT_EQ(1, request_proto.account_cookie_size());
-  EXPECT_EQ("[account_id]", request_proto.account_cookie(0));
 }
 
 TEST_F(CheckinRequestTest, ResponseBodyEmpty) {
   CreateRequest(0u, 0u);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, std::string());
   CompleteFetch();
 
   EXPECT_FALSE(callback_called_);
@@ skipping 150 matching lines @@
 
   SetResponse(VALID_RESPONSE);
   CompleteFetch();
 
   EXPECT_TRUE(callback_called_);
   EXPECT_EQ(kAndroidId, android_id_);
   EXPECT_EQ(kSecurityToken, security_token_);
 }
 
 }  // namespace gcm