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

Unified Diff: chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 9 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
« no previous file with comments | « chrome/browser/sync/test/integration/themes_helper.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
diff --git a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
index f2c0df7708bf88ad9576d044ee4e6de5dd6d2303..fe6882c543d6ffa3a784054f59fcb6ecba182a78 100644
--- a/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
+++ b/chrome/browser/sync_file_system/drive_file_sync_service_mock_unittest.cc
@@ -26,6 +26,7 @@
#include "chrome/common/extensions/extension_builder.h"
#include "chrome/test/base/testing_profile.h"
#include "content/public/test/test_browser_thread.h"
+#include "extensions/common/id_util.h"
#include "net/base/escape.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -87,7 +88,8 @@ void ExpectEqStatus(bool* done,
scoped_refptr<const extensions::Extension> AddTestExtension(
ExtensionService* extension_service,
const base::FilePath::StringType& extension_name) {
- std::string id = Extension::GenerateIdForPath(base::FilePath(extension_name));
+ std::string id = extensions::id_util::GenerateIdForPath(
+ base::FilePath(extension_name));
scoped_refptr<const Extension> extension =
extensions::ExtensionBuilder().SetManifest(
@@ -102,7 +104,8 @@ scoped_refptr<const extensions::Extension> AddTestExtension(
// Converts extension_name to GURL version.
GURL ExtensionNameToGURL(const base::FilePath::StringType& extension_name) {
- std::string id = Extension::GenerateIdForPath(base::FilePath(extension_name));
+ std::string id = extensions::id_util::GenerateIdForPath(
+ base::FilePath(extension_name));
return extensions::Extension::GetBaseURLFromExtensionId(id);
}
« no previous file with comments | « chrome/browser/sync/test/integration/themes_helper.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698