Cleanup pass from Cloud Print Proxy policy check implementation. See original CL at http://codereview.chromium.org/8438020/

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/8620001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111068 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 9 deletions

diff --git a/chrome/browser/service/service_process_control.cc b/chrome/browser/service/service_process_control.cc
index f92e3dd..c59fee1 100644
--- a/chrome/browser/service/service_process_control.cc
+++ b/chrome/browser/service/service_process_control.cc
@@ -56,7 +56,7 @@ void ServiceProcessControl::RunConnectDoneTasks() {
   // avoided.
   TaskList tasks;
 
-  if (is_connected()) {
+  if (IsConnected()) {
     tasks.swap(connect_success_tasks_);
     RunAllTasksHelper(&tasks);
     DCHECK(tasks.empty());
@@ -78,8 +78,8 @@ void ServiceProcessControl::RunAllTasksHelper(TaskList* task_list) {
   }
 }
 
-bool ServiceProcessControl::is_connected() const {
-  return channel_.get() != NULL;
+bool ServiceProcessControl::IsConnected() const {
+  return channel_ != NULL;
 }
 
 void ServiceProcessControl::Launch(const base::Closure& success_task,
diff --git a/chrome/browser/service/service_process_control.h b/chrome/browser/service/service_process_control.h
index c6d8dd5..51929da 100644
--- a/chrome/browser/service/service_process_control.h
+++ b/chrome/browser/service/service_process_control.h
@@ -51,7 +51,7 @@ class ServiceProcessControl : public IPC::Channel::Sender,
 
   // Return true if this object is connected to the service.
   // Virtual for testing.
-  virtual bool is_connected() const;
+  virtual bool IsConnected() const;
 
   // If no service process is currently running, creates a new service process
   // and connects to it. If a service process is already running this method
diff --git a/chrome/browser/service/service_process_control_browsertest.cc b/chrome/browser/service/service_process_control_browsertest.cc
index 84393e5..d82be6a 100644
--- a/chrome/browser/service/service_process_control_browsertest.cc
+++ b/chrome/browser/service/service_process_control_browsertest.cc
@@ -101,7 +101,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
   LaunchServiceProcessControl();
 
   // Make sure we are connected to the service process.
-  EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
+  EXPECT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   SendRequestAndWait();
 
   // And then shutdown the service process.
@@ -115,12 +115,12 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest, LaunchTwice) {
   LaunchServiceProcessControl();
 
   // Make sure we are connected to the service process.
-  EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
+  EXPECT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   SendRequestAndWait();
 
   // Launch the service process again.
   LaunchServiceProcessControl();
-  EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
+  EXPECT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   SendRequestAndWait();
 
   // And then shutdown the service process.
@@ -174,7 +174,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
   // Launch the service process.
   LaunchServiceProcessControl();
   // Make sure we are connected to the service process.
-  EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
+  EXPECT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   Disconnect();
   WaitForShutdown();
 }
@@ -184,7 +184,7 @@ IN_PROC_BROWSER_TEST_F(ServiceProcessControlBrowserTest,
   // Launch the service process.
   LaunchServiceProcessControl();
   // Make sure we are connected to the service process.
-  EXPECT_TRUE(ServiceProcessControl::GetInstance()->is_connected());
+  EXPECT_TRUE(ServiceProcessControl::GetInstance()->IsConnected());
   base::ProcessId service_pid;
   EXPECT_TRUE(GetServiceProcessData(NULL, &service_pid));
   EXPECT_NE(static_cast<base::ProcessId>(0), service_pid);