Move content_restriction.h and main_function_params.h to content/public/common, and put them in t...

chrome/browser/chrome_browser_main.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #define CHROME_BROWSER_CHROME_BROWSER_MAIN_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
 #include "base/tracked_objects.h"
 #include "chrome/browser/first_run/first_run.h"
 #include "chrome/browser/process_singleton.h"
 #include "content/public/browser/browser_main_parts.h"
 
 class BrowserProcessImpl;
 class FieldTrialSynchronizer;
 class HistogramSynchronizer;
 class MetricsService;
 class PrefService;
 class Profile;
 class ShutdownWatcherHelper;
 class TranslateManager;
-struct MainFunctionParams;
 
 namespace chrome_browser {
 // For use by ShowMissingLocaleMessageBox.
 extern const char kMissingLocaleDataTitle[];
 extern const char kMissingLocaleDataMessage[];
 }
 
+namespace content {
+struct MainFunctionParams;
+}
+
 class ChromeBrowserMainParts : public content::BrowserMainParts {
  public:
   virtual ~ChromeBrowserMainParts();
 
   // Constructs metrics service and does related initialization, including
   // creation of field trials. Call only after labs have been converted to
   // switches.
   MetricsService* SetupMetricsAndFieldTrials(PrefService* local_state);
 
-  const MainFunctionParams& parameters() const {
+  const content::MainFunctionParams& parameters() const {
     return parameters_;
   }
   const CommandLine& parsed_command_line() const {
     return parsed_command_line_;
   }
 
  protected:
-  explicit ChromeBrowserMainParts(const MainFunctionParams& parameters);
+  explicit ChromeBrowserMainParts(
+      const content::MainFunctionParams& parameters);
 
   // content::BrowserParts overrides
   virtual void PreEarlyInitialization() OVERRIDE {}
   virtual void PostEarlyInitialization() OVERRIDE {}
   virtual void PreMainMessageLoopStart() OVERRIDE {}
   virtual void ToolkitInitialized() OVERRIDE;
   virtual void PostMainMessageLoopStart() OVERRIDE {}
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
   virtual void PostMainMessageLoopRun();
@@ skipping 40 matching lines @@
   // Add an invocation of your field trial init function to this method.
   void SetupFieldTrials(bool metrics_recording_enabled,
                         bool proxy_policy_is_set);
 
   // Methods for Main Message Loop -------------------------------------------
 
   int PreMainMessageLoopRunImpl();
 
   // Members initialized on construction ---------------------------------------
 
-  const MainFunctionParams& parameters_;
+  const content::MainFunctionParams& parameters_;
   const CommandLine& parsed_command_line_;
   int result_code_;
 
   // Create ShutdownWatcherHelper object for watching jank during shutdown.
   // Please keep |shutdown_watcher| as the first object constructed, and hence
   // it is destroyed last.
   scoped_ptr<ShutdownWatcherHelper> shutdown_watcher_;
 
   // Creating this object starts tracking the creation and deletion of Task
   // instance. This MUST be done before main_message_loop, so that it is
@@ skipping 38 matching lines @@
 // Records the time from our process' startup to the present time in
 // the UMA histogram |metric_name|.
 void RecordBrowserStartupTime();
 
 // Records a time value to an UMA histogram in the context of the
 // PreReadExperiment field-trial. This also reports to the appropriate
 // sub-histogram (_PreRead(Enabled|Disabled)).
 void RecordPreReadExperimentTime(const char* name, base::TimeDelta time);
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_