Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(978)

Side by Side Diff: chrome_frame/test/perf/chrome_frame_perftest.cc

Issue 2222002: Unsigned warning fix - take 2 (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome_frame/test/html_util_unittests.cc ('k') | chrome_frame/test/util_unittests.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 #include "chrome_frame/test/perf/chrome_frame_perftest.h" 4 #include "chrome_frame/test/perf/chrome_frame_perftest.h"
5 5
6 #include <atlwin.h> 6 #include <atlwin.h>
7 #include <atlhost.h> 7 #include <atlhost.h>
8 #include <map> 8 #include <map>
9 #include <vector> 9 #include <vector>
10 #include <string> 10 #include <string>
11 11
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 501
502 ASSERT_TRUE(chrome_frame_memory_test_instance_ != NULL); 502 ASSERT_TRUE(chrome_frame_memory_test_instance_ != NULL);
503 503
504 if (chrome_browser_process_) { 504 if (chrome_browser_process_) {
505 chrome_frame_memory_test_instance_->PrintResult( 505 chrome_frame_memory_test_instance_->PrintResult(
506 "vm_final_browser", "", trace_name + "_vm_b", 506 "vm_final_browser", "", trace_name + "_vm_b",
507 virtual_size_ / 1024, "KB", false /* not important */); 507 virtual_size_ / 1024, "KB", false /* not important */);
508 chrome_frame_memory_test_instance_->PrintResult( 508 chrome_frame_memory_test_instance_->PrintResult(
509 "ws_final_browser", "", trace_name + "_ws_b", 509 "ws_final_browser", "", trace_name + "_ws_b",
510 working_set_size_ / 1024, "KB", false /* not important */); 510 working_set_size_ / 1024, "KB", false /* not important */);
511 } else if (process_id_ == GetCurrentProcessId()) { 511 } else if (process_id_ == base::GetCurrentProcId()) {
512 chrome_frame_memory_test_instance_->PrintResult( 512 chrome_frame_memory_test_instance_->PrintResult(
513 "vm_current_process", "", trace_name + "_vm_c", 513 "vm_current_process", "", trace_name + "_vm_c",
514 virtual_size_ / 1024, "KB", false /* not important */); 514 virtual_size_ / 1024, "KB", false /* not important */);
515 chrome_frame_memory_test_instance_->PrintResult( 515 chrome_frame_memory_test_instance_->PrintResult(
516 "ws_current_process", "", trace_name + "_ws_c", 516 "ws_current_process", "", trace_name + "_ws_c",
517 working_set_size_ / 1024, "KB", false /* not important */); 517 working_set_size_ / 1024, "KB", false /* not important */);
518 } 518 }
519 519
520 printf("\n"); 520 printf("\n");
521 } 521 }
522 522
523 int process_id_; 523 base::ProcessId process_id_;
524 size_t virtual_size_; 524 size_t virtual_size_;
525 size_t working_set_size_; 525 size_t working_set_size_;
526 // Set to true if this is the chrome browser process. 526 // Set to true if this is the chrome browser process.
527 bool chrome_browser_process_; 527 bool chrome_browser_process_;
528 528
529 // A reference to the ChromeFrameMemoryTest instance. Used to print memory 529 // A reference to the ChromeFrameMemoryTest instance. Used to print memory
530 // consumption information. 530 // consumption information.
531 ChromeFrameMemoryTest* chrome_frame_memory_test_instance_; 531 ChromeFrameMemoryTest* chrome_frame_memory_test_instance_;
532 }; 532 };
533 533
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
1063 ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path)); 1063 ASSERT_TRUE(silverlight_key.ReadValue(L"", &plugin_path));
1064 ASSERT_FALSE(plugin_path.empty()); 1064 ASSERT_FALSE(plugin_path.empty());
1065 1065
1066 FilePath silverlight_path = FilePath::FromWStringHack(plugin_path); 1066 FilePath silverlight_path = FilePath::FromWStringHack(plugin_path);
1067 FilePath binaries_to_evict[] = {silverlight_path}; 1067 FilePath binaries_to_evict[] = {silverlight_path};
1068 1068
1069 RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */, 1069 RunStartupTest("creation_cold", "t_silverlight", "", true /* cold */,
1070 arraysize(binaries_to_evict), binaries_to_evict, 1070 arraysize(binaries_to_evict), binaries_to_evict,
1071 false /* important */, true); 1071 false /* important */, true);
1072 } 1072 }
OLDNEW
« no previous file with comments | « chrome_frame/test/html_util_unittests.cc ('k') | chrome_frame/test/util_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698