Revert 48186, 48196, 48198

chrome_frame/test/perf/chrome_frame_perftest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 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_frame/test/perf/chrome_frame_perftest.h"
 
 #include <atlwin.h>
 #include <atlhost.h>
 #include <map>
 #include <vector>
 #include <string>
 
@@ skipping 489 matching lines @@
 
       ASSERT_TRUE(chrome_frame_memory_test_instance_ != NULL);
 
       if (chrome_browser_process_) {
          chrome_frame_memory_test_instance_->PrintResult(
              "vm_final_browser", "", trace_name + "_vm_b",
              virtual_size_ / 1024, "KB", false /* not important */);
          chrome_frame_memory_test_instance_->PrintResult(
              "ws_final_browser", "", trace_name + "_ws_b",
              working_set_size_ / 1024, "KB", false /* not important */);
-      } else if (process_id_ == base::GetCurrentProcId()) {
+      } else if (process_id_ == GetCurrentProcessId()) {
         chrome_frame_memory_test_instance_->PrintResult(
             "vm_current_process", "", trace_name + "_vm_c",
             virtual_size_ / 1024, "KB", false /* not important */);
         chrome_frame_memory_test_instance_->PrintResult(
             "ws_current_process", "", trace_name + "_ws_c",
             working_set_size_ / 1024, "KB", false /* not important */);
       }
 
       printf("\n");
     }
 
-    base::ProcessId process_id_;
+    int process_id_;
     size_t virtual_size_;
     size_t working_set_size_;
     // Set to true if this is the chrome browser process.
     bool chrome_browser_process_;
 
     // A reference to the ChromeFrameMemoryTest instance. Used to print memory
     // consumption information.
     ChromeFrameMemoryTest* chrome_frame_memory_test_instance_;
   };
 
@@ skipping 529 matching lines @@
   ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
   ASSERT_FALSE(plugin_path.empty());
 
   FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
   FilePath binaries_to_evict[] = {silverlight_path};
 
   RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
                  arraysize(binaries_to_evict), binaries_to_evict,
                  false /* important */, true);
 }