Revert 281304 "Pass an instance of FaviconClient to FaviconService."

trunk/src/chrome/browser/history/android/sqlite_cursor_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/history/android/sqlite_cursor.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/favicon/chrome_favicon_client.h"
-#include "chrome/browser/favicon/chrome_favicon_client_factory.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/history/android/android_history_provider_service.h"
 #include "chrome/browser/history/android/android_history_types.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
@@ skipping 166 matching lines @@
   std::vector<std::string> column_names;
   column_names.push_back(
       HistoryAndBookmarkRow::GetAndroidName(HistoryAndBookmarkRow::URL));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::LAST_VISIT_TIME));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::VISIT_COUNT));
   column_names.push_back(HistoryAndBookmarkRow::GetAndroidName(
       HistoryAndBookmarkRow::FAVICON));
 
-  FaviconClient* favicon_client =
-      ChromeFaviconClientFactory::GetForProfile(testing_profile_);
-  FaviconService* favicon_service =
-      new FaviconService(testing_profile_, favicon_client);
+  FaviconService* favicon_service = new FaviconService(testing_profile_);
 
   SQLiteCursor* cursor = new SQLiteCursor(column_names, statement,
       service_.get(), favicon_service);
   cursor->set_test_observer(this);
   JNIEnv* env = base::android::AttachCurrentThread();
   EXPECT_EQ(1, cursor->GetCount(env, NULL));
   EXPECT_EQ(0, cursor->MoveTo(env, NULL, 0));
   EXPECT_EQ(row.url().spec(), base::android::ConvertJavaStringToUTF8(
       cursor->GetString(env, NULL, 0)).c_str());
   EXPECT_EQ(history::ToDatabaseTime(row.last_visit_time()),
       cursor->GetLong(env, NULL, 1));
   EXPECT_EQ(row.visit_count(), cursor->GetInt(env, NULL, 2));
   base::android::ScopedJavaLocalRef<jbyteArray> data =
       cursor->GetBlob(env, NULL, 3);
   std::vector<uint8> out;
   base::android::JavaByteArrayToByteVector(env, data.obj(), &out);
   EXPECT_EQ(data_bytes->data().size(), out.size());
   EXPECT_EQ(data_bytes->data()[0], out[0]);
   cursor->Destroy(env, NULL);
   // Cursor::Destroy posts the task in UI thread, run Message loop to release
   // the statement, delete SQLiteCursor itself etc.
   content::RunAllPendingInMessageLoop();
 }