Cleanup: Fix some misc nits in printing code.

chrome/browser/printing/print_preview_data_service.cc

 // Copyright (c) 2012 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 "chrome/browser/printing/print_preview_data_service.h"
 
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/singleton.h"
 #include "base/stl_util.h"
 #include "printing/print_job_constants.h"
@@ skipping 45 matching lines @@
   }
 
  private:
   friend class base::RefCounted<PrintPreviewDataStore>;
 
   // 1:1 relationship between page index and its associated preview data.
   // Key: Page index is zero-based and can be
   // |printing::COMPLETE_PREVIEW_DOCUMENT_INDEX| to represent complete preview
   // document.
   // Value: Preview data.
-  typedef std::map<int, scoped_refptr<base::RefCountedBytes> >
-      PreviewPageDataMap;
+  using PreviewPageDataMap =
+      std::map<int, scoped_refptr<base::RefCountedBytes>>;
 
   ~PrintPreviewDataStore() {}
 
   static bool IsInvalidIndex(int index) {
     return (index != printing::COMPLETE_PREVIEW_DOCUMENT_INDEX &&
             index < printing::FIRST_PAGE_INDEX);
   }
 
   PreviewPageDataMap page_data_map_;
 
   DISALLOW_COPY_AND_ASSIGN(PrintPreviewDataStore);
 };
 
 // static
 PrintPreviewDataService* PrintPreviewDataService::GetInstance() {
   return Singleton<PrintPreviewDataService>::get();
 }
 
 PrintPreviewDataService::PrintPreviewDataService() {
 }
 
 PrintPreviewDataService::~PrintPreviewDataService() {
 }
 
 void PrintPreviewDataService::GetDataEntry(
-    int32 preview_ui_id,
+    int32_t preview_ui_id,
     int index,
     scoped_refptr<base::RefCountedBytes>* data_bytes) {
-  *data_bytes = NULL;
+  *data_bytes = nullptr;
   PreviewDataStoreMap::const_iterator it = data_store_map_.find(preview_ui_id);
   if (it != data_store_map_.end())
     it->second->GetPreviewDataForIndex(index, data_bytes);
 }
 
 void PrintPreviewDataService::SetDataEntry(
-    int32 preview_ui_id,
+    int32_t preview_ui_id,
     int index,
     const base::RefCountedBytes* data_bytes) {
   if (!ContainsKey(data_store_map_, preview_ui_id))
     data_store_map_[preview_ui_id] = new PrintPreviewDataStore();
 
   data_store_map_[preview_ui_id]->SetPreviewDataForIndex(index, data_bytes);
 }
 
-void PrintPreviewDataService::RemoveEntry(int32 preview_ui_id) {
+void PrintPreviewDataService::RemoveEntry(int32_t preview_ui_id) {
   data_store_map_.erase(preview_ui_id);
 }
 
-int PrintPreviewDataService::GetAvailableDraftPageCount(int32 preview_ui_id) {
+int PrintPreviewDataService::GetAvailableDraftPageCount(int32_t preview_ui_id) {
   PreviewDataStoreMap::const_iterator it = data_store_map_.find(preview_ui_id);
   return (it == data_store_map_.end()) ?
       0 : it->second->GetAvailableDraftPageCount();
 }