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

Side by Side Diff: chrome/browser/performance_monitor/performance_monitor_browsertest.cc

Issue 12093036: Move Extension Location and Type enums to Manifest, and move InstallWarning to its own file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/path_service.h" 8 #include "base/path_service.h"
9 #include "base/string_number_conversions.h" 9 #include "base/string_number_conversions.h"
10 #include "base/threading/sequenced_worker_pool.h" 10 #include "base/threading/sequenced_worker_pool.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 url(extension->url().spec()), 67 url(extension->url().spec()),
68 version(extension->VersionString()), 68 version(extension->VersionString()),
69 location(extension->location()) { 69 location(extension->location()) {
70 } 70 }
71 71
72 std::string description; 72 std::string description;
73 std::string id; 73 std::string id;
74 std::string name; 74 std::string name;
75 std::string url; 75 std::string url;
76 std::string version; 76 std::string version;
77 Extension::Location location; 77 extensions::Manifest::Location location;
78 }; 78 };
79 79
80 // Compare the fields of |extension| to those in |value|; this is a check to 80 // Compare the fields of |extension| to those in |value|; this is a check to
81 // make sure the extension data was recorded properly in the event. 81 // make sure the extension data was recorded properly in the event.
82 void ValidateExtensionInfo(const ExtensionBasicInfo extension, 82 void ValidateExtensionInfo(const ExtensionBasicInfo extension,
83 const DictionaryValue* value) { 83 const DictionaryValue* value) {
84 std::string extension_description; 84 std::string extension_description;
85 std::string extension_id; 85 std::string extension_id;
86 std::string extension_name; 86 std::string extension_name;
87 std::string extension_url; 87 std::string extension_url;
(...skipping 697 matching lines...) Expand 10 before | Expand all | Expand 10 after
785 test_server()->GetURL(std::string("files/").append("title2.html"))); 785 test_server()->GetURL(std::string("files/").append("title2.html")));
786 786
787 performance_monitor()->DoTimedCollections(); 787 performance_monitor()->DoTimedCollections();
788 788
789 metrics = GetStats(METRIC_NETWORK_BYTES_READ); 789 metrics = GetStats(METRIC_NETWORK_BYTES_READ);
790 ASSERT_EQ(2u, metrics.size()); 790 ASSERT_EQ(2u, metrics.size());
791 EXPECT_GE(metrics[1].value, page1_size + page2_size); 791 EXPECT_GE(metrics[1].value, page1_size + page2_size);
792 } 792 }
793 793
794 } // namespace performance_monitor 794 } // namespace performance_monitor
OLDNEW
« no previous file with comments | « chrome/browser/performance_monitor/database_unittest.cc ('k') | chrome/browser/policy/configuration_policy_handler_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698