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

Unified Diff: extensions/browser/extension_icon_image_unittest.cc

Issue 441053005: Use extensions_path.h instead of chrome_path.h from extension_icon_image_unittest.cc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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: extensions/browser/extension_icon_image_unittest.cc
diff --git a/extensions/browser/extension_icon_image_unittest.cc b/extensions/browser/extension_icon_image_unittest.cc
index 62462ff04cc2e740a05a1a81de8bae1be56ebda3..ead9dc04eabfebc9ea3f7e7ea2e79cb5544d4234 100644
--- a/extensions/browser/extension_icon_image_unittest.cc
+++ b/extensions/browser/extension_icon_image_unittest.cc
@@ -7,11 +7,11 @@
#include "base/json/json_file_value_serializer.h"
#include "base/message_loop/message_loop.h"
#include "base/path_service.h"
-#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"
#include "extensions/browser/image_loader.h"
#include "extensions/common/extension.h"
+#include "extensions/common/extension_paths.h"
#include "extensions/common/manifest.h"
#include "extensions/common/manifest_handlers/icons_handler.h"
#include "skia/ext/image_operations.h"
@@ -141,14 +141,14 @@ class ExtensionIconImageTest : public testing::Test,
Manifest::Location location) {
// Create and load an extension.
base::FilePath test_file;
- if (!PathService::Get(chrome::DIR_TEST_DATA, &test_file)) {
+ if (!PathService::Get(extensions::DIR_TEST_DATA, &test_file)) {
EXPECT_FALSE(true);
return NULL;
}
- test_file = test_file.AppendASCII("extensions").AppendASCII(name);
+ test_file = test_file.AppendASCII(name);
int error_code = 0;
std::string error;
- JSONFileValueSerializer serializer(test_file.AppendASCII("app.json"));
+ JSONFileValueSerializer serializer(test_file.AppendASCII("manifest.json"));
scoped_ptr<base::DictionaryValue> valid_value(
static_cast<base::DictionaryValue*>(serializer.Deserialize(&error_code,
&error)));
« no previous file with comments | « chrome/test/data/extensions/extension_icon_image/app.json ('k') | extensions/test/data/extension_icon_image/16.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698