3 files changed, 3 insertions, 18 deletions
diff --git a/app/tree_model.h b/app/tree_model.h
index d2e37b1..df06b9f 100644
--- a/app/tree_model.h
+++ b/app/tree_model.h
@@ -6,7 +6,6 @@
 #define APP_TREE_MODEL_H_
 #pragma once
 
-#include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ -22,9 +21,7 @@ class TreeModel;
 class TreeModelNode {
  public:
   // Returns the title for the node.
-  // TODO(viettrungluu): remove wstring version and rename string16 version.
-  virtual std::wstring GetTitle() const = 0;
-  virtual const string16& GetTitleAsString16() const = 0;
+  virtual const string16& GetTitle() const = 0;
 
  protected:
   virtual ~TreeModelNode() {}
diff --git a/app/tree_node_model.h b/app/tree_node_model.h
index 83e55c9..ac6475b 100644
--- a/app/tree_node_model.h
+++ b/app/tree_node_model.h
@@ -7,7 +7,6 @@
 #pragma once
 
 #include <algorithm>
-#include <string>
 #include <vector>
 
 #include "app/tree_model.h"
@@ -17,7 +16,6 @@
 #include "base/scoped_vector.h"
 #include "base/stl_util-inl.h"
 #include "base/string16.h"
-#include "base/utf_string_conversions.h"
 
 // TreeNodeModel and TreeNodes provide an implementation of TreeModel around
 // TreeNodes. TreeNodes form a directed acyclic graph.
@@ -71,11 +69,6 @@ class TreeNode : public TreeModelNode {
  public:
   TreeNode() : parent_(NULL) { }
 
-  // TODO(munjal): Remove wstring overload once all code is moved to string16.
-#if !defined(WCHAR_T_IS_UTF16)
-  explicit TreeNode(const std::wstring& title)
-      : title_(WideToUTF16(title)), parent_(NULL) {}
-#endif
   explicit TreeNode(const string16& title)
       : title_(title), parent_(NULL) {}
 
@@ -162,13 +155,8 @@ class TreeNode : public TreeModelNode {
     title_ = string;
   }
 
-  // TODO(munjal): Remove wstring version and rename GetTitleAsString16 to
-  // GetTitle once all code is moved to string16.
   // Returns the title of the node.
-  virtual std::wstring GetTitle() const {
-    return UTF16ToWide(title_);
-  }
-  virtual const string16& GetTitleAsString16() const {
+  virtual const string16& GetTitle() const {
     return title_;
   }
 
diff --git a/app/tree_node_model_unittest.cc b/app/tree_node_model_unittest.cc
index 17592495..4621d94 100644
--- a/app/tree_node_model_unittest.cc
+++ b/app/tree_node_model_unittest.cc
@@ -287,5 +287,5 @@ TEST_F(TreeNodeModelTest, SetTitle) {
   const string16 title(ASCIIToUTF16("root2"));
   model.SetTitle(root, title);
   AssertObserverCount(0, 0, 1);
-  EXPECT_EQ(title, root->GetTitleAsString16());
+  EXPECT_EQ(title, root->GetTitle());
 }