Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

chrome/browser/themes/theme_syncable_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/themes/theme_syncable_service.h"
 
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_url_handler.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 
 using std::string;
 
 namespace {
 
 bool IsTheme(const extensions::Extension& extension) {
   return extension.is_theme();
 }
@@ skipping 238 matching lines @@
     theme_specifics->set_use_system_theme_by_default(
         use_system_theme_by_default_);
   }
 
   if (use_custom_theme) {
     DCHECK(current_theme);
     DCHECK(current_theme->is_theme());
     theme_specifics->set_custom_theme_name(current_theme->name());
     theme_specifics->set_custom_theme_id(current_theme->id());
     theme_specifics->set_custom_theme_update_url(
-        current_theme->update_url().spec());
+        extensions::ManifestURL::GetUpdateURL(current_theme).spec());
   } else {
     DCHECK(!current_theme);
     theme_specifics->clear_custom_theme_name();
     theme_specifics->clear_custom_theme_id();
     theme_specifics->clear_custom_theme_update_url();
   }
 }
 
 /* static */
 bool ThemeSyncableService::AreThemeSpecificsEqual(
@@ skipping 30 matching lines @@
       syncer::SyncChange(FROM_HERE, change_type,
                          syncer::SyncData::CreateLocalData(
                              kCurrentThemeClientTag, kCurrentThemeNodeTitle,
                              entity_specifics)));
 
   DVLOG(1) << "Update theme specifics from current theme: "
       << changes.back().ToString();
 
   return sync_processor_->ProcessSyncChanges(FROM_HERE, changes);
 }