Fix content_setting_image_view compile on mac_views_browser

chrome/browser/ui/content_settings/content_setting_image_model_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 "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/content_settings/content_setting_image_model.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/content_settings/core/browser/host_content_settings_map.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_renderer_host.h"
 #include "net/cookies/cookie_options.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/color_palette.h"
 
 namespace {
 
 bool HasIcon(const ContentSettingImageModel& model) {
-#if defined(OS_MACOSX)
-  return !model.icon().IsEmpty();
-#else
   return !model.GetIcon(gfx::kPlaceholderColor).IsEmpty();
-#endif
 }
 
 // Forward all NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED to the specified
 // ContentSettingImageModel.
 class NotificationForwarder : public content::NotificationObserver {
  public:
   explicit NotificationForwarder(ContentSettingImageModel* model)
       : model_(model) {
     registrar_.Add(this,
                    chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED,
@@ skipping 91 matching lines @@
   scoped_ptr<ContentSettingImageModel> content_setting_image_model =
      ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
          CONTENT_SETTINGS_TYPE_IMAGES);
   NotificationForwarder forwarder(content_setting_image_model.get());
   // Should not crash.
   TabSpecificContentSettings::CreateForWebContents(web_contents());
   forwarder.clear();
 }
 
 }  // namespace