Fix naming convention, add disallowed constructors.

BUG=none

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

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

2 files changed, 15 insertions, 11 deletions

diff --git a/content/test/test_browser_thread.cc b/content/test/test_browser_thread.cc
index f3e6cc8..bd31919 100644
--- a/content/test/test_browser_thread.cc
+++ b/content/test/test_browser_thread.cc
@@ -4,18 +4,19 @@
 
 #include "content/test/test_browser_thread.h"
 
+#include "base/message_loop.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
 
 namespace content {
 
 TestBrowserThread::TestBrowserThread(BrowserThread::ID identifier)
-    : impl(new BrowserThreadImpl(identifier)) {
+    : impl_(new BrowserThreadImpl(identifier)) {
 }
 
 TestBrowserThread::TestBrowserThread(BrowserThread::ID identifier,
                                      MessageLoop* message_loop)
-    : impl(new BrowserThreadImpl(identifier, message_loop)) {
+    : impl_(new BrowserThreadImpl(identifier, message_loop)) {
 }
 
 TestBrowserThread::~TestBrowserThread() {
@@ -23,25 +24,25 @@ TestBrowserThread::~TestBrowserThread() {
 }
 
 bool TestBrowserThread::Start() {
-  return impl->Start();
+  return impl_->Start();
 }
 
 bool TestBrowserThread::StartIOThread() {
   base::Thread::Options options;
   options.message_loop_type = MessageLoop::TYPE_IO;
-  return impl->StartWithOptions(options);
+  return impl_->StartWithOptions(options);
 }
 
 void TestBrowserThread::Stop() {
-  impl->Stop();
+  impl_->Stop();
 }
 
 bool TestBrowserThread::IsRunning() {
-  return impl->IsRunning();
+  return impl_->IsRunning();
 }
 
 base::Thread* TestBrowserThread::DeprecatedGetThreadObject() {
-  return impl.get();
+  return impl_.get();
 }
 
 }  // namespace content
diff --git a/content/test/test_browser_thread.h b/content/test/test_browser_thread.h
index 06e632f..5d3439e 100644
--- a/content/test/test_browser_thread.h
+++ b/content/test/test_browser_thread.h
@@ -2,10 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_
-#define CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_
+#ifndef CONTENT_TEST_TEST_BROWSER_THREAD_H_
+#define CONTENT_TEST_TEST_BROWSER_THREAD_H_
 #pragma once
 
+#include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_thread.h"
 
@@ -49,9 +50,11 @@ class TestBrowserThread {
   base::Thread* DeprecatedGetThreadObject();
 
  private:
-  scoped_ptr<BrowserThreadImpl> impl;
+  scoped_ptr<BrowserThreadImpl> impl_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestBrowserThread);
 };
 
 }  // namespace content
 
-#endif  // CONTENT_TEST_TEST_BROWSER_BROWSER_THREAD_H_
+#endif  // CONTENT_TEST_TEST_BROWSER_THREAD_H_