Combine snapshot classes into a template class

installer/src/installer-lib/test/process_test.cpp

Index: installer/src/installer-lib/test/process_test.cpp
===================================================================
--- a/installer/src/installer-lib/test/process_test.cpp
+++ b/installer/src/installer-lib/test/process_test.cpp
@@ -184,7 +184,7 @@
 template< class T, class Admittance, class Extractor >
 void initialize_process_list( std::vector< T > & v, Admittance admit = Admittance(), Extractor extract = Extractor() )
 {
-  initialize_process_list( v, Snapshot(), admit, extract ) ;
+  initialize_process_list( v, Process_Snapshot(), admit, extract ) ;
 }
 
 /**
@@ -193,7 +193,7 @@
 template< class T, class Admittance, class Extractor >
 void initialize_process_set( std::set< T > & s, Admittance admit = Admittance(), Extractor extract = Extractor() )
 {
-  initialize_process_set( s, Snapshot(), admit, extract ) ;
+  initialize_process_set( s, Process_Snapshot(), admit, extract ) ;
 }
 
 //-------------------------------------------------------
@@ -216,7 +216,7 @@
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, our_process_by_name(), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
@@ -229,7 +229,7 @@
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, process_by_name_CI( mixedcase_exe_name ), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
@@ -242,7 +242,7 @@
 {
   std::vector< PROCESSENTRY32W > v ;
   initialize_process_list( v, process_by_any_file_name_CI( file_name_set( multiple_exe_names ) ), copy_all() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( 1u, size );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( 1u, size );
 }
@@ -254,7 +254,7 @@
 {
   std::vector< DWORD > v ;
   initialize_process_list( v, our_process_by_name(), copy_PID() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( size, 1u );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( size, 1u );
 }
@@ -266,7 +266,7 @@
 {
   std::vector< DWORD > v ;
   initialize_process_list( v, find_in_set, copy_PID() ) ;
-  unsigned int size( v.size() );
+  size_t size( v.size() );
   EXPECT_EQ( size, 1u );    // Please, don't run multiple test executables simultaneously
   ASSERT_GE( size, 1u );
 }