Revert 134625 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA en…

chrome/browser/profiles/profile_io_data.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_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
@@ skipping 89 matching lines @@
   }
 
   ChromeURLRequestContext* extensions_request_context() const {
     return extensions_request_context_.get();
   }
 
   BooleanPrefMember* safe_browsing_enabled() const {
     return &safe_browsing_enabled_;
   }
 
-  BooleanPrefMember* enable_metrics() const {
-    return &enable_metrics_;
-  }
-
   net::TransportSecurityState* transport_security_state() const {
     return transport_security_state_.get();
   }
 
   chrome_browser_net::HttpServerPropertiesManager*
       http_server_properties_manager() const;
 
-  bool is_incognito() const {
-    return is_incognito_;
-  }
-
  protected:
   class AppRequestContext : public ChromeURLRequestContext {
    public:
     AppRequestContext();
 
     void SetCookieStore(net::CookieStore* cookie_store);
     void SetHttpTransactionFactory(net::HttpTransactionFactory* http_factory);
 
    private:
     virtual ~AppRequestContext();
 
     scoped_refptr<net::CookieStore> cookie_store_;
     scoped_ptr<net::HttpTransactionFactory> http_factory_;
   };
 
   // Created on the UI thread, read on the IO thread during ProfileIOData lazy
   // initialization.
   struct ProfileParams {
     ProfileParams();
     ~ProfileParams();
 
     FilePath path;
+    bool is_incognito;
     bool clear_local_state_on_exit;
     std::string accept_language;
     std::string accept_charset;
     std::string referrer_charset;
     IOThread* io_thread;
     scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
 
@@ skipping 133 matching lines @@
 
   // Tracks whether or not we've been lazily initialized.
   mutable bool initialized_;
 
   // Data from the UI thread from the Profile, used to initialize ProfileIOData.
   // Deleted after lazy initialization.
   mutable scoped_ptr<ProfileParams> profile_params_;
 
   // Member variables which are pointed to by the various context objects.
   mutable BooleanPrefMember enable_referrers_;
-  mutable BooleanPrefMember enable_metrics_;
   mutable BooleanPrefMember clear_local_state_on_exit_;
   mutable BooleanPrefMember safe_browsing_enabled_;
   // TODO(marja): Remove session_startup_pref_ if no longer needed.
   mutable IntegerPrefMember session_startup_pref_;
 
   // Pointed to by NetworkDelegate.
   mutable scoped_ptr<policy::URLBlacklistManager> url_blacklist_manager_;
 
   // Pointed to by URLRequestContext.
   mutable scoped_ptr<ChromeURLDataManagerBackend>
@@ skipping 23 matching lines @@
   mutable AppRequestContextMap app_request_context_map_;
 
   mutable scoped_ptr<ResourceContext> resource_context_;
 
   mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
   mutable scoped_refptr<CookieSettings> cookie_settings_;
 
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
-  bool is_incognito_;
-
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_