[Extensions] Make extension actions use gfx::Image over gfx::ImageSkia.

chrome/browser/extensions/api/declarative_content/content_action_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/extensions/api/declarative_content/content_action.h"
 
 #include "base/base64.h"
 #include "base/run_loop.h"
 #include "base/test/values_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/test_extension_environment.h"
 #include "chrome/browser/extensions/test_extension_system.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/value_builder.h"
 #include "ipc/ipc_message_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/gfx/image/image_skia.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "ui/gfx/image/image.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
 namespace extensions {
 namespace {
 
 using base::test::ParseJson;
 using testing::HasSubstr;
 
 
 scoped_ptr<base::DictionaryValue> SimpleManifest() {
@@ skipping 162 matching lines @@
   ExtensionAction* page_action =
       ExtensionActionManager::Get(env.profile())->GetPageAction(*extension);
   scoped_ptr<content::WebContents> contents = env.MakeTab();
   const int tab_id = ExtensionTabUtil::GetTabId(contents.get());
   EXPECT_FALSE(page_action->GetIsVisible(tab_id));
   ContentAction::ApplyInfo apply_info = {
     env.profile(), contents.get()
   };
 
   // The declarative icon shouldn't exist unless the content action is applied.
-  EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());
+  EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());
   result->Apply(extension->id(), base::Time(), &apply_info);
-  EXPECT_FALSE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());
+  EXPECT_FALSE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());
   result->Revert(extension->id(), base::Time(), &apply_info);
-  EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).bitmap()->empty());
+  EXPECT_TRUE(page_action->GetDeclarativeIcon(tab_id).IsEmpty());
 }
 
 TEST_F(RequestContentScriptTest, MissingScripts) {
   Init();
   std::string error;
   bool bad_message = false;
   scoped_refptr<const ContentAction> result = ContentAction::Create(
       profile(),
       HostID(HostID::EXTENSIONS, extension()->id()),
       extension(),
@@ skipping 169 matching lines @@
           "  \"matchAboutBlank\": null\n"
           "}"),
       &error,
       &bad_message);
   EXPECT_TRUE(bad_message);
   ASSERT_FALSE(result.get());
 }
 
 }  // namespace
 }  // namespace extensions