[Android] Add enhanced bookmark opt-in flag.

chrome/browser/chrome_browser_main.h

 // Copyright (c) 2012 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_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/field_trial.h"
@@ skipping 78 matching lines @@
     return parameters_;
   }
   const base::CommandLine& parsed_command_line() const {
     return parsed_command_line_;
   }
 
   Profile* profile() { return profile_; }
 
   const PrefService* local_state() const { return local_state_; }
 
+ protected:
+  PrefService* local_state() { return local_state_; }
+
  private:
   // Methods for |SetupMetricsAndFieldTrials()| --------------------------------
 
   // Constructs metrics service and does related initialization, including
   // creation of field trials. Call only after labs have been converted to
   // switches.
   void SetupMetricsAndFieldTrials();
 
   // Starts recording of metrics. This can only be called after we have a file
   // thread.
@@ skipping 84 matching lines @@
   bool restart_last_session_;
 
   // Tests can set this to true to disable restricting cookie access in the
   // network stack, as this can only be done once.
   static bool disable_enforcing_cookie_policies_for_tests_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };
 
 #endif  // CHROME_BROWSER_CHROME_BROWSER_MAIN_H_