Move ResourceBundle, DataPack to ui/base

chrome_frame/test/net/fake_external_tab.cc

 // Copyright (c) 2011 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_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
 #include "app/app_paths.h"
-#include "app/resource_bundle.h"
 #include "app/win/scoped_com_initializer.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/file_util.h"
 #include "base/file_version_info.h"
 #include "base/i18n/icu_util.h"
 #include "base/path_service.h"
 #include "base/scoped_comptr_win.h"
 #include "base/string_util.h"
 #include "base/stringprintf.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test/win_event_receiver.h"
 #include "chrome_frame/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 
 namespace {
 
 // A special command line switch to allow developers to manually launch the
 // browser and debug CF inside the browser.
 const char kManualBrowserLaunch[] = "manual-browser";
 
 // Pops up a message box after the test environment has been set up
 // and before tearing it down.  Useful for when debugging tests and not
 // the test environment that's been set up.
@@ skipping 131 matching lines @@
   ui::SystemMonitor system_monitor;
 
   // The gears plugin causes the PluginRequestInterceptor to kick in and it
   // will cause problems when it tries to intercept URL requests.
   PathService::Override(chrome::FILE_GEARS_PLUGIN, FilePath());
 
   icu_util::Initialize();
 
   chrome::RegisterPathProvider();
   app::RegisterPathProvider();
+  ui::RegisterPathProvider();
 
   // Load Chrome.dll as our resource dll.
   FilePath dll;
   PathService::Get(base::DIR_MODULE, &dll);
   dll = dll.Append(chrome::kBrowserResourcesDll);
   HMODULE res_mod = ::LoadLibraryExW(dll.value().c_str(),
       NULL, LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE);
   DCHECK(res_mod);
   _AtlBaseModule.SetResourceInstance(res_mod);
 
@@ skipping 290 matching lines @@
   // See url_request_unittest.cc for these credentials.
   SupplyProxyCredentials credentials("user", "secret");
   watchdog.AddObserver(&credentials, "Windows Security", "");
   testing::InitGoogleTest(&argc, argv);
   FilterDisabledTests();
   PluginService::EnableChromePlugins(false);
   CFUrlRequestUnittestRunner test_suite(argc, argv);
   test_suite.RunMainUIThread();
   return 0;
 }