[protector] Refactoring of --no-protector code.

chrome/browser/ui/browser_init.cc

 // 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.
 
 #include "chrome/browser/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1564 matching lines @@
   }
 #endif
   return false;
 }
 
 void BrowserInit::LaunchWithProfile::CheckPreferencesBackup(Profile* profile) {
   ProtectorService* protector_service =
       ProtectorServiceFactory::GetForProfile(profile);
   ProtectedPrefsWatcher* prefs_watcher = protector_service->GetPrefsWatcher();
 
-  // BaseSettingChange instances are always created, even when Protector is
-  // disabled, to report corresponding histograms. With Protector disabled,
-  // the backup is updated to match the new setting value, otherwise histograms
-  // would be reported on each run.
-  // TODO(ivankr): move IsEnabled() check to ProtectorService::ShowChange().
-
   // Check if backup is valid.
   if (!prefs_watcher->is_backup_valid()) {
     scoped_ptr<BaseSettingChange> change(
         protector::CreatePrefsBackupInvalidChange());
-    if (protector::IsEnabled())
-      protector_service->ShowChange(change.release());
+    protector_service->ShowChange(change.release());
     // Further checks make no sense.
     return;
   }
 
   // Check for session startup (including pinned tabs) changes.
   if (SessionStartupPref::DidStartupPrefChange(profile) ||
       prefs_watcher->DidPrefChange(prefs::kPinnedTabs)) {
     LOG(WARNING) << "Session startup settings have changed";
     SessionStartupPref new_pref = SessionStartupPref::GetStartupPref(profile);
     PinnedTabCodec::Tabs new_tabs = PinnedTabCodec::ReadPinnedTabs(profile);
     const base::Value* tabs_backup =
         prefs_watcher->GetBackupForPref(prefs::kPinnedTabs);
     scoped_ptr<BaseSettingChange> change(
         protector::CreateSessionStartupChange(
             new_pref,
             new_tabs,
             SessionStartupPref::GetStartupPrefBackup(profile),
             PinnedTabCodec::ReadPinnedTabs(tabs_backup)));
-    if (protector::IsEnabled()) {
-      protector_service->ShowChange(change.release());
-    } else {
-      SessionStartupPref::SetStartupPref(profile, new_pref);
-      PinnedTabCodec::WritePinnedTabs(profile, new_tabs);
-    }
+    protector_service->ShowChange(change.release());
   }
 }
 
 std::vector<GURL> BrowserInit::GetURLsFromCommandLine(
     const CommandLine& command_line,
     const FilePath& cur_dir,
     Profile* profile) {
   std::vector<GURL> urls;
   const CommandLine::StringVector& params = command_line.GetArgs();
 
@@ skipping 301 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }