| Index: chrome/browser/browser_main.h
|
| ===================================================================
|
| --- chrome/browser/browser_main.h (revision 91842)
|
| +++ chrome/browser/browser_main.h (working copy)
|
| @@ -147,8 +147,7 @@
|
| const PrefService* local_state);
|
|
|
| // Add an invocation of your field trial init function to this method.
|
| - void SetupFieldTrials(bool metrics_recording_enabled,
|
| - bool proxy_policy_is_set);
|
| + void SetupFieldTrials(bool metrics_recording_enabled);
|
|
|
| // Members initialized on construction ---------------------------------------
|
|
|
|
|
| Property changes on: chrome/browser/browser_main.h
|
| ___________________________________________________________________
|
| Deleted: svn:mergeinfo
|
|
|
|
|