[Sync] Give custom themes priority over default themes

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/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 288 matching lines @@
           ->MergeDataAndStartSyncing(
                 syncer::THEMES,
                 MakeThemeDataList(sync_pb::ThemeSpecifics()),
                 scoped_ptr<syncer::SyncChangeProcessor>(
                     new syncer::SyncChangeProcessorWrapperForTest(
                         fake_change_processor_.get())),
                 scoped_ptr<syncer::SyncErrorFactory>(
                     new syncer::SyncErrorFactoryMock()))
           .error();
   EXPECT_FALSE(error.IsSet()) << error.message();
-  EXPECT_TRUE(fake_theme_service_->UsingDefaultTheme());
+  EXPECT_FALSE(fake_theme_service_->UsingDefaultTheme());
+  EXPECT_EQ(fake_theme_service_->theme_extension(), theme_extension_.get());
 }
 
 TEST_F(ThemeSyncableServiceTest, SetCurrentThemeSystemTheme) {
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_system_theme_by_default(true);
 
   // Set up theme service to use custom theme.
   fake_theme_service_->SetTheme(theme_extension_.get());
   syncer::SyncError error =
       theme_sync_service_
           ->MergeDataAndStartSyncing(
                 syncer::THEMES,
                 MakeThemeDataList(theme_specifics),
                 scoped_ptr<syncer::SyncChangeProcessor>(
                     new syncer::SyncChangeProcessorWrapperForTest(
                         fake_change_processor_.get())),
                 scoped_ptr<syncer::SyncErrorFactory>(
                     new syncer::SyncErrorFactoryMock()))
           .error();
   EXPECT_FALSE(error.IsSet()) << error.message();
-  EXPECT_TRUE(fake_theme_service_->UsingSystemTheme());
+  EXPECT_FALSE(fake_theme_service_->UsingSystemTheme());
+  EXPECT_EQ(fake_theme_service_->theme_extension(), theme_extension_.get());
 }
 
 TEST_F(ThemeSyncableServiceTest, SetCurrentThemeCustomTheme) {
   sync_pb::ThemeSpecifics theme_specifics;
   theme_specifics.set_use_custom_theme(true);
   theme_specifics.set_custom_theme_id(theme_extension_->id());
   theme_specifics.set_custom_theme_name(kCustomThemeName);
   theme_specifics.set_custom_theme_name(kCustomThemeUrl);
 
   // Set up theme service to use default theme.
@@ skipping 312 matching lines @@
 
 TEST_F(PolicyInstalledThemeTest, InstallThemeByPolicy) {
   // Set up theme service to use custom theme that was installed by policy.
   fake_theme_service_->SetTheme(theme_extension_.get());
 
   syncer::SyncDataList data_list =
       theme_sync_service_->GetAllSyncData(syncer::THEMES);
 
   ASSERT_EQ(0u, data_list.size());
 }