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

Unified Diff: chrome/browser/media_galleries/media_galleries_test_util.cc

Issue 481433005: Extensions: Move id_util functions to crx_file component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: revert last patchset. function returns Extension* and can't use an assert. 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: 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;
- 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(

Powered by Google App Engine
This is Rietveld 408576698