Rejigger ThemeService: move exposure of ThemeProvider interface to a

chrome/browser/themes/theme_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_service.h"
 
 #include "base/files/file_util.h"
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/themes/custom_theme_supplier.h"
+#include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/browser/uninstall_reason.h"
 #include "extensions/common/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/material_design/material_design_controller.h"
 
 #if defined(ENABLE_SUPERVISED_USERS)
 #include "chrome/browser/supervised_user/supervised_user_service.h"
 #include "chrome/browser/supervised_user/supervised_user_service_factory.h"
 #endif
 
 using extensions::ExtensionRegistry;
 
 namespace theme_service_internal {
 
@@ skipping 61 matching lines @@
     ASSERT_TRUE(registry_);
   }
 
   const CustomThemeSupplier* get_theme_supplier(ThemeService* theme_service) {
     return theme_service->get_theme_supplier();
   }
 
  protected:
   bool is_supervised_;
   ExtensionRegistry* registry_;
-
 };
 
 // Installs then uninstalls a theme and makes sure that the ThemeService
 // reverts to the default theme after the uninstall.
 TEST_F(ThemeServiceTest, ThemeInstallUninstall) {
   ThemeService* theme_service =
       ThemeServiceFactory::GetForProfile(profile_.get());
   theme_service->UseDefaultTheme();
   // Let the ThemeService uninstall unused themes.
   base::MessageLoop::current()->RunUntilIdle();
@@ skipping 112 matching lines @@
   EXPECT_TRUE(registry_->GetExtensionById(extension1_id,
                                           ExtensionRegistry::DISABLED));
 
   // 2) Upgrading a disabled theme should not change the current theme.
   UpdateUnpackedTheme(extension1_id);
   EXPECT_EQ(extension2_id, theme_service->GetThemeID());
   EXPECT_TRUE(registry_->GetExtensionById(extension1_id,
                                           ExtensionRegistry::DISABLED));
 }
 
+TEST_F(ThemeServiceTest, IncognitoTest) {
+  ThemeService* theme_service =
+      ThemeServiceFactory::GetForProfile(profile_.get());
+  theme_service->UseDefaultTheme();
+  // Let the ThemeService uninstall unused themes.
+  base::MessageLoop::current()->RunUntilIdle();
+
+  // Should get the same ThemeService for incognito and original profiles.
+  ThemeService* otr_theme_service =
+      ThemeServiceFactory::GetForProfile(profile_->GetOffTheRecordProfile());
+  EXPECT_EQ(theme_service, otr_theme_service);
+
+#if !defined(OS_MACOSX)
+  // Should get a different ThemeProvider for incognito and original profiles.
+  const ui::ThemeProvider& provider =
+      ThemeService::GetThemeProviderForProfile(profile_.get());
+  const ui::ThemeProvider& otr_provider =
+      ThemeService::GetThemeProviderForProfile(
+          profile_->GetOffTheRecordProfile());
+  EXPECT_NE(&provider, &otr_provider);
+  // And (some) colors should be different in MD mode.
+  if (ui::MaterialDesignController::IsModeMaterial()) {
+    EXPECT_NE(provider.GetColor(ThemeProperties::COLOR_TOOLBAR),
+              otr_provider.GetColor(ThemeProperties::COLOR_TOOLBAR));
+  }
+#endif
+}
+
 namespace {
 
 // NotificationObserver which emulates an infobar getting destroyed when the
 // theme changes.
 class InfobarDestroyerOnThemeChange : public content::NotificationObserver {
  public:
-  InfobarDestroyerOnThemeChange(Profile* profile)
+  explicit InfobarDestroyerOnThemeChange(Profile* profile)
       : theme_service_(ThemeServiceFactory::GetForProfile(profile)) {
     registrar_.Add(this, chrome::NOTIFICATION_BROWSER_THEME_CHANGED,
         content::Source<ThemeService>(theme_service_));
   }
 
   ~InfobarDestroyerOnThemeChange() override {}
 
  private:
   void Observe(int type,
                const content::NotificationSource& source,
@@ skipping 80 matching lines @@
   theme_service->UseDefaultTheme();
   EXPECT_TRUE(theme_service->UsingDefaultTheme());
   EXPECT_TRUE(get_theme_supplier(theme_service));
   EXPECT_EQ(get_theme_supplier(theme_service)->get_theme_type(),
             CustomThemeSupplier::SUPERVISED_USER_THEME);
 }
 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
 #endif // defined(ENABLE_SUPERVISED_USERS)
 
 }; // namespace theme_service_internal