| Index: chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| diff --git a/chrome/browser/profile_resetter/profile_resetter_unittest.cc b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| index e561288374c5cd8674298fa6b5a8fdd180a31e8c..34b6110b52b6272958ba1b806231c3963f4607c7 100644
|
| --- a/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| +++ b/chrome/browser/profile_resetter/profile_resetter_unittest.cc
|
| @@ -22,11 +22,11 @@
|
| #include "chrome/browser/themes/theme_service_factory.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| #include "chrome/common/extensions/extension.h"
|
| -#include "chrome/common/extensions/extension_manifest_constants.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/test/base/browser_with_test_window_test.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/test/test_browser_thread.h"
|
| +#include "extensions/common/manifest_constants.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "net/url_request/test_url_fetcher_factory.h"
|
|
|
| @@ -232,16 +232,16 @@ scoped_refptr<Extension> CreateExtension(const std::string& name,
|
| extensions::Manifest::Type type,
|
| bool installed_by_default) {
|
| DictionaryValue manifest;
|
| - manifest.SetString(extension_manifest_keys::kVersion, "1.0.0.0");
|
| - manifest.SetString(extension_manifest_keys::kName, name);
|
| + manifest.SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
|
| + manifest.SetString(extensions::manifest_keys::kName, name);
|
| switch (type) {
|
| case extensions::Manifest::TYPE_THEME:
|
| - manifest.Set(extension_manifest_keys::kTheme, new DictionaryValue);
|
| + manifest.Set(extensions::manifest_keys::kTheme, new DictionaryValue);
|
| break;
|
| case extensions::Manifest::TYPE_HOSTED_APP:
|
| - manifest.SetString(extension_manifest_keys::kLaunchWebURL,
|
| + manifest.SetString(extensions::manifest_keys::kLaunchWebURL,
|
| "http://www.google.com");
|
| - manifest.SetString(extension_manifest_keys::kUpdateURL,
|
| + manifest.SetString(extensions::manifest_keys::kUpdateURL,
|
| "http://clients2.google.com/service/update2/crx");
|
| break;
|
| case extensions::Manifest::TYPE_EXTENSION:
|
| @@ -250,7 +250,7 @@ scoped_refptr<Extension> CreateExtension(const std::string& name,
|
| default:
|
| NOTREACHED();
|
| }
|
| - manifest.SetString(extension_manifest_keys::kOmniboxKeyword, name);
|
| + manifest.SetString(extensions::manifest_keys::kOmniboxKeyword, name);
|
| std::string error;
|
| scoped_refptr<Extension> extension = Extension::Create(
|
| path,
|
|
|