Hide ContentClient getters from embedders so that they they don't reuse content's embedder API. The…

chrome/browser/search/local_omnibox_popup_source.cc

 // Copyright 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/search/local_omnibox_popup_source.h"
 
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
 #include "chrome/common/url_constants.h"
-#include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 #include "net/url_request/url_request.h"
+#include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
 const char kHtmlFilename[] = "local-omnibox-popup.html";
 const char kJSFilename[] = "local-omnibox-popup.js";
 const char kCssFilename[] = "local-omnibox-popup.css";
 const char kPageIconFilename[] = "images/page_icon.png";
 const char kPageIcon2xFilename[] = "images/2x/page_icon.png";
 const char kSearchIconFilename[] = "images/search_icon.png";
 const char kSearchIcon2xFilename[] = "images/2x/search_icon.png";
@@ skipping 28 matching lines @@
   } else if (path == kSearchIconFilename) {
     identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_SEARCH_ICON_PNG;
   } else if (path == kSearchIcon2xFilename) {
     identifier = IDR_LOCAL_OMNIBOX_POPUP_IMAGES_2X_SEARCH_ICON_PNG;
   } else {
     callback.Run(NULL);
     return;
   }
 
   scoped_refptr<base::RefCountedStaticMemory> response(
-      content::GetContentClient()->GetDataResourceBytes(identifier));
+      ResourceBundle::GetSharedInstance().LoadDataResourceBytes(identifier));
   callback.Run(response);
 }
 
 std::string LocalOmniboxPopupSource::GetMimeType(
     const std::string& path) const {
   if (path == kHtmlFilename)
     return "text/html";
   if (path == kJSFilename)
     return "application/javascript";
   if (path == kCssFilename)
@@ skipping 18 matching lines @@
   }
   return false;
 }
 
 std::string LocalOmniboxPopupSource::GetContentSecurityPolicyFrameSrc() const {
   // Allow embedding of chrome search suggestion host.
   return base::StringPrintf("frame-src %s://%s/;",
                             chrome::kChromeSearchScheme,
                             chrome::kChromeSearchSuggestionHost);
 }