Chromium Code Reviews| Index: chrome/browser/media_galleries/media_galleries_test_util.cc |
| diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc |
| index 45206a8fd54ac34a8d355331da3c2067d726bbc9..f62dcd816986419df1595d662b150de1de8c0152 100644 |
| --- a/chrome/browser/media_galleries/media_galleries_test_util.cc |
| +++ b/chrome/browser/media_galleries/media_galleries_test_util.cc |
| @@ -18,9 +18,9 @@ |
| #include "chrome/browser/media_galleries/fileapi/picasa_finder.h" |
| #include "chrome/browser/profiles/profile.h" |
| #include "chrome/common/chrome_paths.h" |
| +#include "components/crx_file/id_util.h" |
| #include "extensions/browser/extension_prefs.h" |
| #include "extensions/browser/extension_system.h" |
| -#include "extensions/common/extension.h" |
| #include "extensions/common/manifest_constants.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| @@ -69,8 +69,8 @@ scoped_refptr<extensions::Extension> AddMediaGalleriesApp( |
| *manifest.get(), |
| extensions::Extension::NO_FLAGS, &errors); |
| EXPECT_TRUE(extension.get() != NULL) << errors; |
|
Lei Zhang
2014/08/19 21:13:24
FYI, this likely needs to be an ASSERT_TRUE(), oth
tommycli
2014/08/19 21:38:57
Done.
|
| - EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id())); |
| - if (!extension.get() || !extensions::Extension::IdIsValid(extension->id())) |
| + EXPECT_TRUE(crx_file::id_util::IdIsValid(extension->id())); |
| + if (!extension.get() || !crx_file::id_util::IdIsValid(extension->id())) |
| return NULL; |
| extension_prefs->OnExtensionInstalled( |