Fix test expectations to use bool checks rather than null compares

sync/internal_api/attachments/attachment_downloader_impl_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 "sync/internal_api/public/attachments/attachment_downloader_impl.h"
 
 #include <stdint.h>
 
 #include <map>
 
@@ skipping 52 matching lines @@
                                  const ScopeSet& scopes,
                                  const std::string& access_token) override;
 
  private:
   base::WeakPtr<RequestImpl> last_request_;
   int num_invalidate_token_;
 };
 
 void MockOAuth2TokenService::RespondToAccessTokenRequest(
     GoogleServiceAuthError error) {
-  EXPECT_TRUE(last_request_ != NULL);
+  EXPECT_TRUE(last_request_);
   std::string access_token;
   base::Time expiration_time;
   if (error == GoogleServiceAuthError::AuthErrorNone()) {
     access_token = kAccessToken;
     expiration_time = base::Time::Max();
   }
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&OAuth2TokenService::RequestImpl::InformConsumer,
                  last_request_,
                  error,
                  access_token,
                  expiration_time));
 }
 
 void MockOAuth2TokenService::FetchOAuth2Token(
     RequestImpl* request,
     const std::string& account_id,
     net::URLRequestContextGetter* getter,
     const std::string& client_id,
     const std::string& client_secret,
     const ScopeSet& scopes) {
   // Only one request at a time is allowed.
-  EXPECT_TRUE(last_request_ == NULL);
+  EXPECT_FALSE(last_request_);
   last_request_ = request->AsWeakPtr();
 }
 
 void MockOAuth2TokenService::InvalidateAccessTokenImpl(
     const std::string& account_id,
     const std::string& client_id,
     const ScopeSet& scopes,
     const std::string& access_token) {
   ++num_invalidate_token_;
 }
@@ skipping 118 matching lines @@
 void AttachmentDownloaderImplTest::TearDown() {
   RunMessageLoop();
 }
 
 void AttachmentDownloaderImplTest::CompleteDownload(
     int response_code,
     HashHeaderType hash_header_type) {
   // TestURLFetcherFactory remembers last active URLFetcher.
   net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
   // There should be outstanding url fetch request.
-  EXPECT_TRUE(fetcher != NULL);
+  EXPECT_TRUE(fetcher);
   fetcher->set_status(net::URLRequestStatus());
   fetcher->set_response_code(response_code);
   if (response_code == net::HTTP_OK) {
     fetcher->SetResponseString(kAttachmentContent);
   }
   AddHashHeader(hash_header_type, fetcher);
 
   // Call URLFetcherDelegate.
   net::URLFetcherDelegate* delegate = fetcher->delegate();
   delegate->OnURLFetchComplete(fetcher);
   RunMessageLoop();
   // Once result is processed URLFetcher should be deleted.
   fetcher = url_fetcher_factory_.GetFetcherByID(0);
-  EXPECT_TRUE(fetcher == NULL);
+  EXPECT_FALSE(fetcher);
 }
 
 void AttachmentDownloaderImplTest::DownloadDone(
     const AttachmentId& attachment_id,
     const AttachmentDownloader::DownloadResult& result,
     std::unique_ptr<Attachment> attachment) {
   download_results_.insert(std::make_pair(attachment_id, result));
   if (result == AttachmentDownloader::DOWNLOAD_SUCCESS) {
     // Successful download should be accompanied by valid attachment with
     // matching id and valid data.
-    EXPECT_TRUE(attachment != NULL);
+    EXPECT_TRUE(attachment);
     EXPECT_EQ(attachment_id, attachment->GetId());
 
     scoped_refptr<base::RefCountedMemory> data = attachment->GetData();
     std::string data_as_string(data->front_as<char>(), data->size());
     EXPECT_EQ(data_as_string, kAttachmentContent);
   } else {
-    EXPECT_TRUE(attachment == NULL);
+    EXPECT_FALSE(attachment);
   }
   ++num_completed_downloads_;
 }
 
 void AttachmentDownloaderImplTest::VerifyDownloadResult(
     const AttachmentId& attachment_id,
     const AttachmentDownloader::DownloadResult& result) {
   ResultsMap::const_iterator iter = download_results_.find(attachment_id);
   EXPECT_TRUE(iter != download_results_.end());
   EXPECT_EQ(iter->second, result);
@@ skipping 253 matching lines @@
   raw += "\n";
   std::replace(raw.begin(), raw.end(), '\n', '\0');
   scoped_refptr<net::HttpResponseHeaders> headers(
       new net::HttpResponseHeaders(raw));
   uint32_t extracted;
   ASSERT_FALSE(
       AttachmentDownloaderImpl::ExtractCrc32c(headers.get(), &extracted));
 }
 
 }  // namespace syncer