Move ResourceBundle, DataPack to ui/base

chrome/browser/diagnostics/diagnostics_main.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/browser/diagnostics/diagnostics_main.h"
 
 #if defined(OS_POSIX)
 #include <stdio.h>
 #include <unistd.h>
 #endif
 
 #include <iostream>
 
 #include "app/app_paths.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/i18n/icu_util.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 #include "chrome/common/chrome_paths.h"
+#include "ui/base/ui_base_paths.h"
 
 namespace {
 // This is a minimalistic interface to wrap the platform console.  This will be
 // eventually replaced by a view that can be subclassed for each platform and
 // that the approved look and feel.
 class SimpleConsole {
  public:
   enum Color {
     DEFAULT,
     RED,
@@ skipping 302 matching lines @@
 
 int DiagnosticsMain(const CommandLine& command_line) {
   // If we can't initialize the console exit right away.
   SimpleConsole* console = SimpleConsole::Create();
   if (!console || !console->Init())
     return 1;
 
   // We need to have the path providers registered. They both
   // return void so there is no early error signal that we can use.
   app::RegisterPathProvider();
+  ui::RegisterPathProvider();
   chrome::RegisterPathProvider();
 
   TestWriter writer(console);
   DiagnosticsModel* model = MakeDiagnosticsModel(command_line);
   TestController controller(&writer);
 
   // Run all the diagnostic tests.
   controller.Run(model);
   delete model;
 
   // The "press enter to continue" prompt isn't very unixy, so only do that on
   // Windows.
 #if defined(OS_WIN)
   // Block here so the user can see the results.
   writer.WriteInfoText(L"Press [enter] to continue\n");
   std::wstring txt;
   console->Read(&txt);
 #endif
   delete console;
   return 0;
 }