Rip out browser-side RID caching for most visited items.

chrome/browser/ui/webui/favicon_source_unittest.cc

 // Copyright (c) 2013 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/ui/webui/favicon_source.h"
 
 #include "base/message_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_factory.h"
@@ skipping 17 matching lines @@
     std::vector<ui::ScaleFactor> supported_scale_factors;
     supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
     supported_scale_factors.push_back(ui::SCALE_FACTOR_140P);
     scoped_set_supported_scale_factors_.reset(
         new ui::test::ScopedSetSupportedScaleFactors(supported_scale_factors));
   }
 
   virtual ~FaviconSourceTest() {
   }
 
-  // Adds a most visited item with |url| and an arbitrary title to the instant
-  // service and returns the assigned id.
-  int AddInstantMostVisitedUrlAndGetId(GURL url) {
-    InstantMostVisitedItem item;
-    item.url = GURL(url);
-    std::vector<InstantMostVisitedItem> items(1, item);
-
-    InstantService* instant_service =
-        InstantServiceFactory::GetForProfile(profile_.get());
-    instant_service->AddMostVisitedItems(items);
-
-    std::vector<InstantMostVisitedItemIDPair> items_with_ids;
-    instant_service->GetCurrentMostVisitedItems(&items_with_ids);
-    CHECK_EQ(1u, items_with_ids.size());
-    return items_with_ids[0].first;
-  }
-
   FaviconSource* favicon_source() const { return favicon_source_.get(); }
 
  private:
   base::MessageLoop loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread io_thread_;
   scoped_ptr<TestingProfile> profile_;
 
   typedef scoped_ptr<ui::test::ScopedSetSupportedScaleFactors>
       ScopedSetSupportedScaleFactors;
   ScopedSetSupportedScaleFactors scoped_set_supported_scale_factors_;
 
   scoped_ptr<FaviconSource> favicon_source_;
 
   DISALLOW_COPY_AND_ASSIGN(FaviconSourceTest);
 };
 
 // Test parsing the chrome-search://favicon/ URLs
 TEST_F(FaviconSourceTest, InstantParsing) {
-  GURL kUrl1("http://www.google.com/");
-  GURL kUrl2("http://maps.google.com/");
-  int instant_id1 = AddInstantMostVisitedUrlAndGetId(kUrl1);
-  int instant_id2 = AddInstantMostVisitedUrlAndGetId(kUrl2);
-
+  const std::string path("chrome-search/favicon/http://www.google.com");

[Jered, 2013/05/31 17:34:33]

What is up with the "chrome-search" prefixed to this path?

[kmadhusu, 2013/06/04 02:36:01]

I missed ":/" in the path. Fixed.

   bool is_icon_url;
   GURL url;
   int size_in_dip;
   ui::ScaleFactor scale_factor;
 
-  const std::string path1 = base::IntToString(instant_id1);
-  EXPECT_TRUE(favicon_source()->ParsePath(path1, &is_icon_url, &url,
+  EXPECT_TRUE(favicon_source()->ParsePath(path, &is_icon_url, &url,
       &size_in_dip, &scale_factor));
   EXPECT_FALSE(is_icon_url);
-  EXPECT_EQ(kUrl1, url);
-  EXPECT_EQ(16, size_in_dip);
-  EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
-
-  const std::string path2 = base::IntToString(instant_id2);
-  EXPECT_TRUE(favicon_source()->ParsePath(path2, &is_icon_url, &url,
-      &size_in_dip, &scale_factor));
-  EXPECT_FALSE(is_icon_url);
-  EXPECT_EQ(kUrl2, url);
+  EXPECT_EQ(GURL(path), url);
   EXPECT_EQ(16, size_in_dip);
   EXPECT_EQ(ui::SCALE_FACTOR_100P, scale_factor);
 }
 
 // Test parsing the chrome://favicon URLs
 TEST_F(FaviconSourceTest, Parsing) {
   const GURL kUrl("https://www.google.ca/imghp?hl=en&tab=wi");
 
   bool is_icon_url;
   GURL url;
@@ skipping 105 matching lines @@
   EXPECT_EQ(ui::SCALE_FACTOR_140P, scale_factor);
 
   const std::string path14 =
       "largest/iconurl/http://www.google.com/favicon.ico";
   EXPECT_TRUE(favicon_source()->ParsePath(path14, &is_icon_url, &url,
       &size_in_dip, &scale_factor));
   EXPECT_TRUE(is_icon_url);
   EXPECT_EQ("http://www.google.com/favicon.ico", url.spec());
   EXPECT_EQ(0, size_in_dip);
 }