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

Unified Diff: chrome/browser/ui/app_list/app_list_test_util.cc

Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflict Created 6 years, 6 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/ui/app_list/app_list_test_util.cc
diff --git a/chrome/browser/ui/app_list/app_list_test_util.cc b/chrome/browser/ui/app_list/app_list_test_util.cc
index 4f92c18c03f477dce3ec40c7a4f4e8249241455b..da8f0791e8ecf7837e53e30abe623ece83773618 100644
--- a/chrome/browser/ui/app_list/app_list_test_util.cc
+++ b/chrome/browser/ui/app_list/app_list_test_util.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/ui/app_list/app_list_test_util.h"
#include "base/files/file_path.h"
+#include "chrome/browser/extensions/extension_service.h"
#include "chrome/common/chrome_constants.h"
#include "extensions/common/extension_set.h"
@@ -20,7 +21,7 @@ AppListTestBase::AppListTestBase() {}
AppListTestBase::~AppListTestBase() {}
void AppListTestBase::SetUp() {
- ExtensionServiceTestBase::SetUp();
+ extensions::ExtensionServiceTestBase::SetUp();
// Load "app_list" extensions test profile.
// The test profile has 5 extensions:
@@ -28,9 +29,8 @@ void AppListTestBase::SetUp() {
// - 2 packaged extension apps
// - 1 hosted extension app
// - 1 ephemeral app (which should not be visible in the launcher)
- base::FilePath source_install_dir = data_dir_
- .AppendASCII("app_list")
- .AppendASCII("Extensions");
+ base::FilePath source_install_dir =
+ data_dir().AppendASCII("app_list").AppendASCII("Extensions");
base::FilePath pref_path = source_install_dir
.DirName()
.Append(chrome::kPreferencesFilename);
« no previous file with comments | « chrome/browser/ui/app_list/app_list_test_util.h ('k') | chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698