Commit 3ef20988 authored by limasdf@gmail.com's avatar limasdf@gmail.com

Use extensions_path.h instead of chrome_path.h from extension_icon_image_unittest.cc

R=rockot@chromium.org
BUG=159265

Review URL: https://codereview.chromium.org/441053005

Cr-Commit-Position: refs/heads/master@{#288307}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288307 0039d316-1c4b-4281-b951-d872f2087c98
parent 1e34c13c
...@@ -7,11 +7,11 @@ ...@@ -7,11 +7,11 @@
#include "base/json/json_file_value_serializer.h" #include "base/json/json_file_value_serializer.h"
#include "base/message_loop/message_loop.h" #include "base/message_loop/message_loop.h"
#include "base/path_service.h" #include "base/path_service.h"
#include "chrome/common/chrome_paths.h"
#include "chrome/test/base/testing_profile.h" #include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h" #include "content/public/test/test_browser_thread.h"
#include "extensions/browser/image_loader.h" #include "extensions/browser/image_loader.h"
#include "extensions/common/extension.h" #include "extensions/common/extension.h"
#include "extensions/common/extension_paths.h"
#include "extensions/common/manifest.h" #include "extensions/common/manifest.h"
#include "extensions/common/manifest_handlers/icons_handler.h" #include "extensions/common/manifest_handlers/icons_handler.h"
#include "skia/ext/image_operations.h" #include "skia/ext/image_operations.h"
...@@ -141,14 +141,14 @@ class ExtensionIconImageTest : public testing::Test, ...@@ -141,14 +141,14 @@ class ExtensionIconImageTest : public testing::Test,
Manifest::Location location) { Manifest::Location location) {
// Create and load an extension. // Create and load an extension.
base::FilePath test_file; 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); EXPECT_FALSE(true);
return NULL; return NULL;
} }
test_file = test_file.AppendASCII("extensions").AppendASCII(name); test_file = test_file.AppendASCII(name);
int error_code = 0; int error_code = 0;
std::string error; std::string error;
JSONFileValueSerializer serializer(test_file.AppendASCII("app.json")); JSONFileValueSerializer serializer(test_file.AppendASCII("manifest.json"));
scoped_ptr<base::DictionaryValue> valid_value( scoped_ptr<base::DictionaryValue> valid_value(
static_cast<base::DictionaryValue*>(serializer.Deserialize(&error_code, static_cast<base::DictionaryValue*>(serializer.Deserialize(&error_code,
&error))); &error)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment