Revert 55400 - Cleanup in base. This moves the implementation (and a bunch of...

chrome/test/unit/chrome_test_suite.h

 // 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.
 
 #ifndef CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
 #define CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_
 #pragma once
 
 #include <string>
 
 #include "build/build_config.h"
 
 #include "app/app_paths.h"
 #include "app/resource_bundle.h"
-#include "base/command_line.h"
 #include "base/stats_table.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/process_util.h"
 #include "base/ref_counted.h"
 #include "base/scoped_nsautorelease_pool.h"
 #include "base/test/test_suite.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/scoped_ole_initializer.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/testing_browser_process.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/net_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "base/mac_util.h"
 #endif
 
 #if defined(OS_POSIX)
 #include "base/shared_memory.h"
 #endif
 
 static void RemoveSharedMemoryFile(const std::string& filename) {
@@ skipping 33 matching lines @@
     // Make the test fail so it's harder to ignore.
     // If you really need to make real DNS query, use
     // net::RuleBasedHostResolverProc and its AllowDirectLookup method.
     EXPECT_TRUE(local) << "Making external DNS lookup of " << host;
 
     return ResolveUsingPrevious(host, address_family, host_resolver_flags,
                                 addrlist, os_error);
   }
 };
 
-class ChromeTestSuite : public base::TestSuite {
+class ChromeTestSuite : public TestSuite {
  public:
   ChromeTestSuite(int argc, char** argv)
-      : base::TestSuite(argc, argv),
+      : TestSuite(argc, argv),
         stats_table_(NULL),
         created_user_data_dir_(false) {
   }
 
  protected:
 
   virtual void Initialize() {
     base::ScopedNSAutoreleasePool autorelease_pool;
 
-    base::TestSuite::Initialize();
+    TestSuite::Initialize();
 
     chrome::RegisterChromeSchemes();
     host_resolver_proc_ = new WarningHostResolverProc();
     scoped_host_resolver_proc_.Init(host_resolver_proc_.get());
 
     chrome::RegisterPathProvider();
     app::RegisterPathProvider();
     g_browser_process = new TestingBrowserProcess;
 
     // Notice a user data override, and otherwise default to using a custom
@@ skipping 57 matching lines @@
     // Delete the test_user_data dir recursively
     // NOTE: user_data_dir will be deleted only if it was automatically
     // created.
     FilePath user_data_dir;
     if (created_user_data_dir_ &&
         PathService::Get(chrome::DIR_USER_DATA, &user_data_dir) &&
         !user_data_dir.empty()) {
       file_util::Delete(user_data_dir, true);
       file_util::Delete(user_data_dir.DirName(), false);
     }
-    base::TestSuite::Shutdown();
+    TestSuite::Shutdown();
   }
 
   void SetBrowserDirectory(const FilePath& browser_dir) {
     browser_dir_ = browser_dir;
   }
 
   StatsTable* stats_table_;
   // The name used for the stats file so it can be cleaned up on posix during
   // test shutdown.
   std::string stats_filename_;
 
   // Alternative path to browser binaries.
   FilePath browser_dir_;
 
   ScopedOleInitializer ole_initializer_;
   scoped_refptr<WarningHostResolverProc> host_resolver_proc_;
   net::ScopedDefaultHostResolverProc scoped_host_resolver_proc_;
 
   // Flag indicating whether user_data_dir was automatically created or not.
   bool created_user_data_dir_;
 };
 
 #endif  // CHROME_TEST_UNIT_CHROME_TEST_SUITE_H_