diff options
| -rw-r--r-- | chrome/test/unit/unit_tests.scons | 5 | ||||
| -rw-r--r-- | chrome/views/tree_node_iterator.h | 6 |
2 files changed, 4 insertions, 7 deletions
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons index b8833a8..d51503b 100644 --- a/chrome/test/unit/unit_tests.scons +++ b/chrome/test/unit/unit_tests.scons @@ -151,7 +151,7 @@ input_files = ChromeFileList([ '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc', '$CHROME_DIR/browser/safe_browsing/protocol_parser_unittest.cc', '$CHROME_DIR/browser/history/query_parser_unittest.cc', - '$CHROME_DIR/browser/renderer_security_policy_unittest.cc', + '$CHROME_DIR/browser/renderer_host/renderer_security_policy_unittest.cc', '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc', '$CHROME_DIR/browser/rlz/rlz_unittest.cc', '$CHROME_DIR/browser/safe_browsing/safe_browsing_database_unittest.cc', @@ -409,7 +409,6 @@ if not env.Bit('windows'): '$CHROME_DIR/browser/printing/win_printing_context_unittest.cc', '$CHROME_DIR/browser/profile_manager_unittest.cc', '$CHROME_DIR/browser/renderer_host/resource_dispatcher_host_unittest.cc', - '$CHROME_DIR/browser/renderer_security_policy_unittest.cc', '$CHROME_DIR/browser/rlz/rlz_unittest.cc', '$CHROME_DIR/browser/safe_browsing/protocol_manager_unittest.cc', '$CHROME_DIR/browser/search_engines/template_url_model_unittest.cc', @@ -437,7 +436,6 @@ if not env.Bit('windows'): '$CHROME_DIR/common/resource_dispatcher_unittest.cc', '$CHROME_DIR/common/time_format_unittest.cc', '$CHROME_DIR/common/win_util_unittest.cc', - '$CHROME_DIR/renderer/mock_render_thread.cc', '$CHROME_DIR/renderer/net/render_dns_master_unittest.cc', '$CHROME_DIR/renderer/render_view_unittest.cc', '$CHROME_DIR/renderer/render_widget_unittest.cc', @@ -454,7 +452,6 @@ if not env.Bit('windows'): '$CHROME_DIR/views/grid_layout_unittest.cc', '$CHROME_DIR/views/label_unittest.cc', '$CHROME_DIR/views/table_view_unittest.cc', - '$CHROME_DIR/views/tree_node_iterator_unittest.cc', '$CHROME_DIR/views/view_unittest.cc', # Commented out for now because googleurl_tests doesn't build with diff --git a/chrome/views/tree_node_iterator.h b/chrome/views/tree_node_iterator.h index 2b73954..57c7b40 100644 --- a/chrome/views/tree_node_iterator.h +++ b/chrome/views/tree_node_iterator.h @@ -55,12 +55,12 @@ class TreeNodeIterator { } private: - template <class NodeType> + template <class PositionNodeType> struct Position { - Position(NodeType* node, int index) : node(node), index(index) {} + Position(PositionNodeType* node, int index) : node(node), index(index) {} Position() : node(NULL), index(-1) {} - NodeType* node; + PositionNodeType* node; int index; }; |