Move [Homepage,Options,Update,DevTools]URL out of Extension

chrome/browser/extensions/extension_service_unittest.cc

Index: chrome/browser/extensions/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index f809c045722e6f69de140abebfc0e2ad22783a30..244ee7aa4d29dff2b5b4360ca4c203c29b5dda5d 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -62,6 +62,7 @@
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
@@ -2938,8 +2939,13 @@ TEST_F(ExtensionServiceTest, UpdatePendingExtensionAlreadyInstalled) {
 
   // Use AddExtensionImpl() as AddFrom*() would balk.
   service_->pending_extension_manager()->AddExtensionImpl(
-      good->id(), good->update_url(), Version(), &IsExtension,
-      kGoodIsFromSync, kGoodInstallSilently, Extension::INTERNAL);
+      good->id(),
+      extensions::ExtensionURL::GetUpdateURL(good),
+      Version(),
+      &IsExtension,
+      kGoodIsFromSync,
+      kGoodInstallSilently,
+      Extension::INTERNAL);
   UpdateExtension(good->id(), path, ENABLED);
 
   EXPECT_FALSE(service_->pending_extension_manager()->IsIdPending(kGoodId));
@@ -4722,7 +4728,8 @@ TEST_F(ExtensionServiceTest, GetSyncData) {
   EXPECT_EQ(service_->IsExtensionEnabled(good_crx), data.enabled());
   EXPECT_EQ(service_->IsIncognitoEnabled(good_crx), data.incognito_enabled());
   EXPECT_TRUE(data.version().Equals(*extension->version()));
-  EXPECT_EQ(extension->update_url(), data.update_url());
+  EXPECT_EQ(extensions::ExtensionURL::GetUpdateURL(extension),
+            data.update_url());
   EXPECT_EQ(extension->name(), data.name());
 }
 
@@ -4747,7 +4754,8 @@ TEST_F(ExtensionServiceTest, GetSyncDataTerminated) {
   EXPECT_EQ(service_->IsExtensionEnabled(good_crx), data.enabled());
   EXPECT_EQ(service_->IsIncognitoEnabled(good_crx), data.incognito_enabled());
   EXPECT_TRUE(data.version().Equals(*extension->version()));
-  EXPECT_EQ(extension->update_url(), data.update_url());
+  EXPECT_EQ(extensions::ExtensionURL::GetUpdateURL(extension),
+            data.update_url());
   EXPECT_EQ(extension->name(), data.name());
 }