Getting the personalization info in chrome://snippets-internals correct.

components/ntp_snippets/ntp_snippets_fetcher.h

 // Copyright 2016 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 COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_
 #define COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_
 
 #include <memory>
 #include <set>
 #include <string>
@@ skipping 47 matching lines @@
     SUCCESS,
     EMPTY_HOSTS,
     URL_REQUEST_STATUS_ERROR,
     HTTP_ERROR,
     JSON_PARSE_ERROR,
     INVALID_SNIPPET_CONTENT_ERROR,
     OAUTH_TOKEN_ERROR,
     RESULT_MAX
   };
 
+  // Enumaration listing all possible variants of dealing with personalization.

[Bernhard Bauer, 2016/05/18 10:08:03]

"Enumeration"

[jkrcal, 2016/05/19 07:30:28]

Done.

+  enum class Personalization { kPersonal, kNonPersonal, kBoth };

[Bernhard Bauer, 2016/05/18 10:08:04]

Put the values on individual lines :)

[jkrcal, 2016/05/19 07:30:28]

One line is what "git cl format" produces. Should I fight against it? ;)

[Bernhard Bauer, 2016/05/19 08:51:19]

Yeah, it would be nice. I don't think clang-format grasps the concept of trying
to avoid churn when adding more values.

[jkrcal, 2016/05/19 10:58:16]

I am afraid I do not understand. Do you suggest me to put it on separate lines
and _not_ run "git cl format" afterwards?

Is there some way I can force this format to persist in the future (when someone
else calls git cl format)?

[Bernhard Bauer, 2016/05/19 11:05:46]

That is correct. There are areas of the code base that enforce clang-format
cleanness, but this area doesn't, and generally clang-format does not override
style decisions (or the style guide).
Not that I know. (You could try making the names longer of course ;-) )

[jkrcal, 2016/05/19 16:36:24]

Done.

+
   NTPSnippetsFetcher(
       SigninManagerBase* signin_manager,
       OAuth2TokenService* oauth2_token_service,
       scoped_refptr<net::URLRequestContextGetter> url_request_context_getter,
       const ParseJSONCallback& parse_json_callback,
       bool is_stable_channel);
   ~NTPSnippetsFetcher() override;
 
   // Set a callback that is called when a new set of snippets are downloaded,
   // overriding any previously set callback.
@@ skipping 10 matching lines @@
                               int count);
 
   // Debug string representing the status/result of the last fetch attempt.
   const std::string& last_status() const { return last_status_; }
 
   // Returns the last json fetched from the server.
   const std::string& last_json() const {
     return last_fetch_json_;
   }
 
+  // Returns the last json fetched from the server.

[Bernhard Bauer, 2016/05/18 10:08:04]

Nit: JSON

[jkrcal, 2016/05/19 07:30:28]

Done.

+  const Personalization personalization() const { return personalization_; }

[Bernhard Bauer, 2016/05/18 10:08:04]

Const for a return type that is by itself immutable is unnecessary.

[jkrcal, 2016/05/19 07:30:28]

Thanks. Interestingly, it even does not compile on iOS.

+
+  // Does the fetcher use host restriction?
+  bool UseHostRestriction() const;

[Bernhard Bauer, 2016/05/18 10:08:03]

Nit: "host restrictions" (plural). Also, "uses", so it isn't confused with an
imperative.

[jkrcal, 2016/05/19 07:30:28]

Done.

+  // Does the fetcher use authentication to get personalized results?
+  bool UseAuthentication() const;

[Bernhard Bauer, 2016/05/18 10:08:03]

"Uses" here as well.

[jkrcal, 2016/05/19 07:30:28]

Done.

+
   // Overrides internal clock for testing purposes.
   void SetTickClockForTesting(std::unique_ptr<base::TickClock> tick_clock) {
     tick_clock_ = std::move(tick_clock);
   }
 
  private:
-  enum class Personalization { kPersonal, kNonPersonal, kBoth };
-
   void FetchSnippetsImpl(const GURL& url,
                          const std::string& auth_header,
                          const std::string& request);
   std::string GetHostRestricts() const;
-  bool UseHostRestriction() const;
-  bool UseAuthentication() const;
   void FetchSnippetsNonAuthenticated();
   void FetchSnippetsAuthenticated(const std::string& account_id,
                                   const std::string& oauth_access_token);
   void StartTokenRequest();
 
   // OAuth2TokenService::Consumer overrides:
   void OnGetTokenSuccess(const OAuth2TokenService::Request* request,
                          const std::string& access_token,
                          const base::Time& expiration_time) override;
   void OnGetTokenFailure(const OAuth2TokenService::Request* request,
@@ skipping 51 matching lines @@
   // Allow for an injectable tick clock for testing.
   std::unique_ptr<base::TickClock> tick_clock_;
 
   base::WeakPtrFactory<NTPSnippetsFetcher> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NTPSnippetsFetcher);
 };
 }  // namespace ntp_snippets
 
 #endif  // COMPONENTS_NTP_SNIPPETS_NTP_SNIPPETS_FETCHER_H_