Restored an option to enable enhanced bookmarks experiment from Finch

chrome/browser/bookmarks/enhanced_bookmarks_features.h

Index: chrome/browser/bookmarks/enhanced_bookmarks_features.h
diff --git a/chrome/browser/bookmarks/enhanced_bookmarks_features.h b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
index c3bf9591dc17834bc481ccc26d2ad621cd0a0dee..f88d61933bc7afe09ebec0419ec749f7ffb53f1f 100644
--- a/chrome/browser/bookmarks/enhanced_bookmarks_features.h
+++ b/chrome/browser/bookmarks/enhanced_bookmarks_features.h
@@ -14,9 +14,20 @@ class PrefService;
 enum BookmarksExperimentState {

[brettw, 2014/05/08 20:12:04]

Can you have a comment above here giving an overview of the experiment states
and what they mean? It seems there are two similar but different experiment
types that may mean different things.

[yefimt, 2014/05/08 20:32:31]

Done.

   kNoBookmarksExperiment,
   kBookmarksExperimentEnabled,
-  kBookmarksExperimentEnabledUserOptOut
+  kBookmarksExperimentEnabledUserOptOut,
+  kBookmarksExperimentEnabledFromFinch,
+  kBookmarksExperimentOptOutFromFinch,
+  kBookmarksExperimentEnabledFromFinchUserSignedIn,
+  kBookmarksExperimentEnumSize
 };
 
+bool GetBookmarksExperimentExtensionID(const PrefService* user_prefs,

[brettw, 2014/05/08 20:12:04]

This header file is quite confusing. There are no comments on these two new
functions. There is a function UpdateBookmarksExperimentState and
UpdateBookmarksExperiment and I don't see how these are supposed to be different
and why I might call one or the other.

[yefimt, 2014/05/08 20:32:31]

Done.

+                                       std::string* extension_id);
+
+void UpdateBookmarksExperimentState(const PrefService* user_prefs,
+                                    PrefService* local_state,
+                                    bool user_signed_in);
+
 // Sets flag to opt-in user into Finch experiment.
 void UpdateBookmarksExperiment(
     PrefService* local_state,
@@ -25,6 +36,9 @@ void UpdateBookmarksExperiment(
 // Returns true if enhanced bookmarks experiment is enabled.

[brettw, 2014/05/08 20:12:04]

I think this should say mroe clearly how this is different than the Finch one.

[yefimt, 2014/05/08 20:32:31]

Done.

 bool IsEnhancedBookmarksExperimentEnabled();
 
+// Returns true if enhanced bookmarks experiment is enabled from Finch.
+bool IsEnhancedBookmarksExperimentEnabledFromFinch();

[brettw, 2014/05/08 20:12:04]

Does this need to be a public function or can it be in an anon namespace in the
.cc file? It doesn't seem to be used elsewhere and its presence is confusing
here. Can you do the same with any of the other functions?

[yefimt, 2014/05/08 20:32:31]

Done.

+
 // Returns true when flag enable-dom-distiller is set or enabled from Finch.
 bool IsEnableDomDistillerSet();