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

chrome/browser/themes/theme_syncable_service_unittest.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/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread.h"
 #include "sync/api/sync_error_factory_mock.h"
 #include "sync/api/sync_error.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/protocol/theme_specifics.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 320 matching lines @@
   ASSERT_EQ(1u, change_list.size());
   EXPECT_TRUE(change_list[0].IsValid());
   EXPECT_EQ(syncer::SyncChange::ACTION_ADD, change_list[0].change_type());
   EXPECT_EQ(syncer::THEMES, change_list[0].sync_data().GetDataType());
 
   const sync_pb::ThemeSpecifics& theme_specifics =
       change_list[0].sync_data().GetSpecifics().theme();
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name());
-  EXPECT_EQ(theme_extension_->update_url().spec(),
+  EXPECT_EQ(extensions::ExtensionURL::GetUpdateURL(theme_extension_).spec(),
             theme_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, GetAllSyncData) {
   // Set up theme service to use custom theme.
   fake_theme_service_->SetTheme(theme_extension_.get());
 
   syncer::SyncDataList data_list =
       theme_sync_service_->GetAllSyncData(syncer::THEMES);
 
   ASSERT_EQ(1u, data_list.size());
   const sync_pb::ThemeSpecifics& theme_specifics =
       data_list[0].GetSpecifics().theme();
   EXPECT_TRUE(theme_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), theme_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), theme_specifics.custom_theme_name());
-  EXPECT_EQ(theme_extension_->update_url().spec(),
+  EXPECT_EQ(extensions::ExtensionURL::GetUpdateURL(theme_extension_).spec(),
             theme_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, ProcessSyncThemeChange) {
   // Set up theme service to use default theme.
   fake_theme_service_->UseDefaultTheme();
   fake_theme_service_->MarkClean();
 
   // Start syncing.
   syncer::SyncError error = theme_sync_service_->MergeDataAndStartSyncing(
@@ skipping 42 matching lines @@
 
   // Change current theme to custom theme and notify theme_sync_service_.
   fake_theme_service_->SetTheme(theme_extension_.get());
   theme_sync_service_->OnThemeChange();
   EXPECT_EQ(1u, change_list.size());
   const sync_pb::ThemeSpecifics& change_specifics =
       change_list[0].sync_data().GetSpecifics().theme();
   EXPECT_TRUE(change_specifics.use_custom_theme());
   EXPECT_EQ(theme_extension_->id(), change_specifics.custom_theme_id());
   EXPECT_EQ(theme_extension_->name(), change_specifics.custom_theme_name());
-  EXPECT_EQ(theme_extension_->update_url().spec(),
+  EXPECT_EQ(extensions::ExtensionURL::GetUpdateURL(theme_extension_).spec(),
             change_specifics.custom_theme_update_url());
 }
 
 TEST_F(ThemeSyncableServiceTest, StopSync) {
   syncer::SyncChangeList change_list;
   static_cast<FakeSyncChangeProcessor*>(fake_change_processor_.get())->
       SetChangeOutput(&change_list);
 
   // Set up theme service to use default theme.
   fake_theme_service_->UseDefaultTheme();
@@ skipping 115 matching lines @@
   // use_system_theme_by_default bit should be preserved.
   fake_theme_service_->UseDefaultTheme();
   theme_sync_service_->OnThemeChange();
   EXPECT_EQ(1u, change_list.size());
   const sync_pb::ThemeSpecifics& change_specifics =
       change_list[0].sync_data().GetSpecifics().theme();
   EXPECT_FALSE(change_specifics.use_custom_theme());
   EXPECT_TRUE(change_specifics.use_system_theme_by_default());
 }
 #endif