Move ResourceBundle, DataPack to ui/base

chrome/test/unit/chrome_test_suite.cc

 // Copyright (c) 2010 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/test/unit/chrome_test_suite.h"
 
 #include "app/app_paths.h"
-#include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
 #include "base/metrics/stats_table.h"
 #include "base/process_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_browser_process.h"
 #include "net/base/net_errors.h"
+#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/ui_base_paths.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/shared_memory.h"
 #endif
 
 static void RemoveSharedMemoryFile(const std::string& filename) {
@@ skipping 57 matching lines @@
   base::mac::ScopedNSAutoreleasePool autorelease_pool;
 
   base::TestSuite::Initialize();
 
   chrome::RegisterChromeSchemes();
   host_resolver_proc_ = new LocalHostResolverProc();
   scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
 
   chrome::RegisterPathProvider();
   app::RegisterPathProvider();
+  ui::RegisterPathProvider();
   g_browser_process = new TestingBrowserProcess;
 
   if (!browser_dir_.empty()) {
     PathService::Override(base::DIR_EXE, browser_dir_);
     PathService::Override(base::DIR_MODULE, browser_dir_);
   }
 
 #if defined(OS_MACOSX)
   // Look in the framework bundle for resources.
   FilePath path;
@@ skipping 26 matching lines @@
   delete g_browser_process;
   g_browser_process = NULL;
 
   // Tear down shared StatsTable; prevents unit_tests from leaking it.
   base::StatsTable::set_current(NULL);
   delete stats_table_;
   RemoveSharedMemoryFile(stats_filename_);
 
   base::TestSuite::Shutdown();
 }