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

Unified Diff: chrome/browser/performance_monitor/database_unittest.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, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/performance_monitor/database_unittest.cc
diff --git a/chrome/browser/performance_monitor/database_unittest.cc b/chrome/browser/performance_monitor/database_unittest.cc
index e6826939e02a662b1872a8a2e29f91d031782e22..71b4690b4ce43b9e1e40bb19b431b465ad7c2ef3 100644
--- a/chrome/browser/performance_monitor/database_unittest.cc
+++ b/chrome/browser/performance_monitor/database_unittest.cc
@@ -16,11 +16,13 @@
#include "chrome/browser/performance_monitor/metric.h"
#include "chrome/browser/performance_monitor/performance_monitor_util.h"
#include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/leveldatabase/src/include/leveldb/db.h"
#include "third_party/leveldatabase/src/include/leveldb/iterator.h"
using extensions::Extension;
+using extensions::Manifest;
namespace performance_monitor {
@@ -130,19 +132,19 @@ class PerformanceMonitorDatabaseEventTest : public ::testing::Test {
void InitEvents() {
install_event_1_ = util::CreateExtensionEvent(
EVENT_EXTENSION_INSTALL, clock_->GetTime(), "a", "extension 1",
- "http://foo.com", static_cast<int>(Extension::LOAD), "0.1",
+ "http://foo.com", static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
install_event_2_ = util::CreateExtensionEvent(
EVENT_EXTENSION_INSTALL, clock_->GetTime(), "b", "extension 2",
- "http://bar.com", static_cast<int>(Extension::LOAD), "0.1",
+ "http://bar.com", static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
uninstall_event_1_ = util::CreateExtensionEvent(
EVENT_EXTENSION_UNINSTALL, clock_->GetTime(), "a", "extension 1",
- "http://foo.com", static_cast<int>(Extension::LOAD), "0.1",
+ "http://foo.com", static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
uninstall_event_2_ = util::CreateExtensionEvent(
EVENT_EXTENSION_UNINSTALL, clock_->GetTime(), "b", "extension 2",
- "http://bar.com", static_cast<int>(Extension::LOAD), "0.1",
+ "http://bar.com", static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
}
};
@@ -356,12 +358,12 @@ TEST_F(PerformanceMonitorDatabaseEventTest, GetEventsTimeRange) {
scoped_ptr<Event> new_install_event =
util::CreateExtensionEvent(EVENT_EXTENSION_INSTALL, clock_->GetTime(),
"c", "test extension", "http://foo.com",
- static_cast<int>(Extension::LOAD), "0.1",
+ static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
scoped_ptr<Event> new_uninstall_event =
util::CreateExtensionEvent(EVENT_EXTENSION_UNINSTALL, clock_->GetTime(),
"c", "test extension", "http://foo.com",
- static_cast<int>(Extension::LOAD), "0.1",
+ static_cast<int>(Manifest::LOAD), "0.1",
"Test Test");
base::Time end_time = clock_->GetTime();
db_->AddEvent(*new_install_event.get());

Powered by Google App Engine
This is Rietveld 408576698