Cleanup pass from Cloud Print Proxy policy implementation.

chrome/browser/printing/cloud_print/cloud_print_proxy_service.cc

 // Copyright (c) 2011 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/printing/cloud_print/cloud_print_proxy_service.h"
 
 #include <stack>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 147 matching lines @@
     g_browser_process->notification_ui_manager()->CancelById(
         token_expired_delegate_->id());
     token_expired_delegate_ = NULL;
     if (!keep_alive)
       BrowserList::EndKeepAlive();
   }
 }
 
 void CloudPrintProxyService::ApplyCloudPrintConnectorPolicy() {
   if (!profile_->GetPrefs()->GetBoolean(prefs::kCloudPrintProxyEnabled)) {
-    std::string email;
-    email = profile_->GetPrefs()->GetString(prefs::kCloudPrintEmail);
+    std::string email =
+        profile_->GetPrefs()->GetString(prefs::kCloudPrintEmail);
     if (!email.empty()) {
       DisableForUser();
       profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, std::string());
     }
   }
 }
 
 void CloudPrintProxyService::OnCloudPrintSetupClosed() {
   MessageLoop::current()->PostTask(
       FROM_HERE, base::Bind(&BrowserList::EndKeepAlive));
 }
 
 void CloudPrintProxyService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_PREF_CHANGED) {
-    ApplyCloudPrintConnectorPolicy();
-  } else {
-    NOTREACHED();
-  }
+  DCHECK_EQ(chrome::NOTIFICATION_PREF_CHANGED, type);
+  ApplyCloudPrintConnectorPolicy();
 }
 
 void CloudPrintProxyService::RefreshCloudPrintProxyStatus() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   ServiceProcessControl* process_control = GetServiceProcessControl();
-  DCHECK(process_control->is_connected());
+  DCHECK(process_control->IsConnected());
   ServiceProcessControl::CloudPrintProxyInfoHandler callback =
        base::Bind(&CloudPrintProxyService::ProxyInfoCallback,
                   base::Unretained(this));
   // GetCloudPrintProxyInfo takes ownership of callback.
   process_control->GetCloudPrintProxyInfo(callback);
 }
 
 void CloudPrintProxyService::EnableCloudPrintProxy(const std::string& lsid,
                                                    const std::string& email) {
   ServiceProcessControl* process_control = GetServiceProcessControl();
-  DCHECK(process_control->is_connected());
+  DCHECK(process_control->IsConnected());
   process_control->Send(new ServiceMsg_EnableCloudPrintProxy(lsid));
   // Assume the IPC worked.
   profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, email);
 }
 
 void CloudPrintProxyService::EnableCloudPrintProxyWithRobot(
     const std::string& robot_auth_code,
     const std::string& robot_email,
     const std::string& user_email) {
   ServiceProcessControl* process_control = GetServiceProcessControl();
-  DCHECK(process_control->is_connected());
+  DCHECK(process_control->IsConnected());
   process_control->Send(new ServiceMsg_EnableCloudPrintProxyWithRobot(
       robot_auth_code,
       robot_email,
       user_email));
   // Assume the IPC worked.
   profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, user_email);
 }
 
 void CloudPrintProxyService::DisableCloudPrintProxy() {
   ServiceProcessControl* process_control = GetServiceProcessControl();
-  DCHECK(process_control->is_connected());
+  DCHECK(process_control->IsConnected());
   process_control->Send(new ServiceMsg_DisableCloudPrintProxy);
   // Assume the IPC worked.
   profile_->GetPrefs()->SetString(prefs::kCloudPrintEmail, std::string());
 }
 
 void CloudPrintProxyService::ProxyInfoCallback(
     const cloud_print::CloudPrintProxyInfo& proxy_info) {
   proxy_id_ = proxy_info.proxy_id;
   profile_->GetPrefs()->SetString(
       prefs::kCloudPrintEmail,
       proxy_info.enabled ? proxy_info.email : std::string());
   ApplyCloudPrintConnectorPolicy();
 }
 
 bool CloudPrintProxyService::InvokeServiceTask(const base::Closure& task) {
   GetServiceProcessControl()->Launch(task, base::Closure());
   return true;
 }
 
 ServiceProcessControl* CloudPrintProxyService::GetServiceProcessControl() {
   return ServiceProcessControl::GetInstance();
 }