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

Unified Diff: chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc

Issue 102103005: Move c/c/e/extension_set to top-level extensions/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 7 years 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/sync_file_system/drive_backend/sync_engine_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
index f07033c18d1c25bdf4265bc85435abdad7778538..ff6d5df28de6af638df6d28306b4afdf06fb8270 100644
--- a/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_backend/sync_engine_unittest.cc
@@ -16,6 +16,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "extensions/common/extension.h"
#include "extensions/common/extension_builder.h"
+#include "extensions/common/extension_set.h"
#include "extensions/common/value_builder.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -53,11 +54,11 @@ class MockExtensionService : public TestExtensionService {
MockExtensionService() {}
virtual ~MockExtensionService() {}
- virtual const ExtensionSet* extensions() const OVERRIDE {
+ virtual const extensions::ExtensionSet* extensions() const OVERRIDE {
return &extensions_;
}
- virtual const ExtensionSet* disabled_extensions() const OVERRIDE {
+ virtual const extensions::ExtensionSet* disabled_extensions() const OVERRIDE {
return &disabled_extensions_;
}
@@ -89,8 +90,8 @@ class MockExtensionService : public TestExtensionService {
}
private:
- ExtensionSet extensions_;
- ExtensionSet disabled_extensions_;
+ extensions::ExtensionSet extensions_;
+ extensions::ExtensionSet disabled_extensions_;
DISALLOW_COPY_AND_ASSIGN(MockExtensionService);
};
« no previous file with comments | « chrome/browser/sync/test/integration/sync_extension_helper.cc ('k') | chrome/browser/themes/theme_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698