Revert of [DevTools] Fix favicon images on chrome://inspect

chrome/browser/android/dev_tools_discovery_provider_android.cc

 // Copyright 2015 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/android/dev_tools_discovery_provider_android.h"
 
-#include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/android/tab_android.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/ui/android/tab_model/tab_model.h"
 #include "chrome/browser/ui/android/tab_model/tab_model_list.h"
 #include "components/devtools_discovery/basic_target_descriptor.h"
 #include "components/devtools_discovery/devtools_discovery_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/gfx/codec/png_codec.h"
 
 using content::DevToolsAgentHost;
 using content::WebContents;
 
 namespace {
 
+GURL GetFaviconURLForContents(WebContents* web_contents) {
+  content::NavigationController& controller = web_contents->GetController();
+  content::NavigationEntry* entry = controller.GetActiveEntry();
+  if (entry != NULL && entry->GetURL().is_valid())
+    return entry->GetFavicon().url;
+  return GURL();
+}
+
 class TabDescriptor : public devtools_discovery::DevToolsTargetDescriptor {
  public:
   static TabDescriptor* CreateForWebContents(int tab_id,
                                              WebContents* web_contents) {
     return new TabDescriptor(tab_id, web_contents);
   }
 
   static TabDescriptor* CreateForUnloadedTab(int tab_id,
                                              const base::string16& title,
                                              const GURL& url) {
@@ skipping 85 matching lines @@
       return false;
     model->CloseTabAt(index);
     return true;
   }
 
  private:
   TabDescriptor(int tab_id, WebContents* web_contents)
       : tab_id_(tab_id),
         title_(base::UTF16ToUTF8(web_contents->GetTitle())),
         url_(web_contents->GetURL()),
-        favicon_url_(CalculateFaviconURL()),
+        favicon_url_(GetFaviconURLForContents(web_contents)),
         last_activity_time_(web_contents->GetLastActiveTime()) {
   }
 
   TabDescriptor(int tab_id, const base::string16& title, const GURL& url)
       : tab_id_(tab_id),
         title_(base::UTF16ToUTF8(title)),
-        url_(url),
-        favicon_url_(CalculateFaviconURL()) {
-  }
-
-  GURL CalculateFaviconURL() {
-    TabModel* model;
-    int index;
-    if (!FindTab(&model, &index))
-      return GURL();
-
-    TabAndroid* tab = model->GetTabAt(index);
-    if (!tab)
-      return GURL();
-
-    SkBitmap bitmap = tab->GetFaviconBitmap();
-    if (bitmap.empty())
-      return GURL();
-
-    std::vector<unsigned char> data;
-    SkAutoLockPixels lock_image(bitmap);
-    bool encoded = gfx::PNGCodec::FastEncodeBGRASkBitmap(bitmap, false, &data);
-    if (!encoded)
-      return GURL();
-
-    std::string base_64_data;
-    base::Base64Encode(
-        base::StringPiece(reinterpret_cast<char*>(&data[0]), data.size()),
-        &base_64_data);
-    return GURL("data:image/png;base64," + base_64_data);
+        url_(url) {
   }
 
   bool FindTab(TabModel** model_result, int* index_result) const {
     for (TabModelList::const_iterator iter = TabModelList::begin();
         iter != TabModelList::end(); ++iter) {
       TabModel* model = *iter;
       for (int i = 0; i < model->GetTabCount(); ++i) {
         TabAndroid* tab = model->GetTabAt(i);
         if (tab && tab->GetAndroidId() == tab_id_) {
           *model_result = model;
@@ skipping 84 matching lines @@
 }
 
 // static
 void DevToolsDiscoveryProviderAndroid::Install() {
   devtools_discovery::DevToolsDiscoveryManager* discovery_manager =
       devtools_discovery::DevToolsDiscoveryManager::GetInstance();
   discovery_manager->AddProvider(
       make_scoped_ptr(new DevToolsDiscoveryProviderAndroid()));
   discovery_manager->SetCreateCallback(base::Bind(&CreateNewAndroidTab));
 }